| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-18 16:27:49 +0000 (Thu, 18 Feb 2010) |
| 3 |
New Revision: 15371 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/dispatch-conf |
| 7 |
Log: |
| 8 |
Remove unused merge_cmd variable. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/bin/dispatch-conf |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/bin/dispatch-conf 2010-02-18 16:26:32 UTC (rev 15370) |
| 14 |
+++ main/trunk/bin/dispatch-conf 2010-02-18 16:27:49 UTC (rev 15371) |
| 15 |
@@ -117,7 +117,6 @@ |
| 16 |
"use-rcs=yes in config; fatal', file=sys.stderr) |
| 17 |
return False |
| 18 |
|
| 19 |
- merge_cmd = self.options.get("merge", "").split() |
| 20 |
|
| 21 |
# config file freezing support |
| 22 |
frozen_files = set(self.options.get("frozen-files", "").split()) |
Archives