git-gui: fix the mergetool launcher for the Beyond Compare tool.
authorPat Thoyts <patthoyts@users.sourceforge.net>
Fri, 22 Feb 2013 20:13:21 +0000 (22 20:13 +0000)
committerPat Thoyts <patthoyts@users.sourceforge.net>
Fri, 22 Feb 2013 20:13:21 +0000 (22 20:13 +0000)
When using Beyond Compare as the mergetool it fails to save the merged
result correctly due to a quoting problem when executing the tool.
This patch solves the quoting problem.

Signed-off-by: Warren Falk <warren@warrenfalk.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
lib/mergetool.tcl

index 3c8e73b..120bc40 100644 (file)
@@ -189,9 +189,9 @@ proc merge_resolve_tool2 {} {
        }
        bc3 {
                if {$base_stage ne {}} {
-                       set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -mergeoutput="$MERGED"]
+                       set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" "-mergeoutput=$MERGED"]
                } else {
-                       set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" -mergeoutput="$MERGED"]
+                       set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" "-mergeoutput=$MERGED"]
                }
        }
        ecmerge {