git-gui: fix the mergetool launcher for the Beyond Compare tool.
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>
Pat Thoyts committed
Feb 22, 2013 at 20:13 UTC
60468d6c893a6ad8795869d979a601e47cb90732
1 file changed
+2
-2
lib/mergetool.tcl
+2
-2
@@ -189,9 +189,9 @@ proc merge_resolve_tool2 {} {
189
}
190
bc3 {
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
} else {
194
- set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" -mergeoutput="$MERGED"]
194
+ set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" "-mergeoutput=$MERGED"]
195
}
196
}
197
ecmerge {