summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-02-18 16:27:49 +0000
committerZac Medico <zmedico@gentoo.org>2010-02-18 16:27:49 +0000
commit291e2f89392abfc6d7f00432b47c318401cdf55f (patch)
treed1f3577282f8265db7130b763f878c14117100c1
parentfb6eb2af2d75b904d9cd7c0a7648714b22923e45 (diff)
downloadportage-291e2f89392abfc6d7f00432b47c318401cdf55f.tar.gz
portage-291e2f89392abfc6d7f00432b47c318401cdf55f.tar.bz2
portage-291e2f89392abfc6d7f00432b47c318401cdf55f.zip
Remove unused merge_cmd variable.
svn path=/main/trunk/; revision=15371
-rwxr-xr-xbin/dispatch-conf1
1 files changed, 0 insertions, 1 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index f504a7a0d..4ceb1a0fa 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -117,7 +117,6 @@ class dispatch:
"use-rcs=yes in config; fatal', file=sys.stderr)
return False
- merge_cmd = self.options.get("merge", "").split()
# config file freezing support
frozen_files = set(self.options.get("frozen-files", "").split())