From df085424c9885bce596c587ddd38bc419cc8ae0e Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 2 Mar 2010 20:28:07 +0000
Subject: Remove unused merge_cmd variable. (trunk r15371)

svn path=/main/branches/2.1.7/; revision=15598
---
 bin/dispatch-conf | 1 -
 1 file changed, 1 deletion(-)

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())
-- 
cgit v1.2.3-1-g7c22