summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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())