Remove unused merge_cmd variable. (trunk r15371)

svn path=/main/branches/2.1.7/; revision=15598

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index f504a7a0d73737e7add12b1d50f26916b764c064..4ceb1a0fa0da4b65d11db11d69d1861588c6a81f 100755 (executable)
--- 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())