git-gui: fix the mergetool launcher for the Beyond Compare tool.

patthoyts · patthoyts · commit 60468d6c893a · 2013-02-22T20:13:21.000Z
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 &lt;warren@warrenfalk.com&gt;
Signed-off-by: Pat Thoyts &lt;patthoyts@users.sourceforge.net&gt;
diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -189,9 +189,9 @@ proc merge_resolve_tool2 {} {`
`189`	`189`	`}`
`190`	`190`	`bc3 {`
`191`	`191`	`if {$base_stage ne {}} {`
`192`		`- set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -mergeoutput="$MERGED"]`
	`192`	`+ set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" "-mergeoutput=$MERGED"]`
`193`	`193`	`} else {`
`194`		`- set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" -mergeoutput="$MERGED"]`
	`194`	`+ set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" "-mergeoutput=$MERGED"]`
`195`	`195`	`}`
`196`	`196`	`}`
`197`	`197`	`ecmerge {`