summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPat Thoyts <patthoyts@users.sourceforge.net>2013-02-22 20:13:21 (GMT)
committerPat Thoyts <patthoyts@users.sourceforge.net>2013-02-22 20:13:21 (GMT)
commit60468d6c893a6ad8795869d979a601e47cb90732 (patch)
tree0ad0984e974d181dae5aab54749c062f52b751b5
parent9f316463ba00576d6c848bf50194b72246e8f9ab (diff)
downloadgit-60468d6c893a6ad8795869d979a601e47cb90732.zip
git-60468d6c893a6ad8795869d979a601e47cb90732.tar.gz
git-60468d6c893a6ad8795869d979a601e47cb90732.tar.bz2
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>
-rw-r--r--lib/mergetool.tcl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl
index 3c8e73b..120bc40 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 {