From 60468d6c893a6ad8795869d979a601e47cb90732 Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Fri, 22 Feb 2013 20:13:21 +0000 Subject: 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 Signed-off-by: Pat Thoyts --- lib/mergetool.tcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl index 3c8e73bceb..120bc4064b 100644 --- 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 { -- cgit v1.2.3