projects
/
git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'ks/t7508-indent-fix' into maint
[git]
/
mergetools
/
meld
diff --git
a/mergetools/meld
b/mergetools/meld
index
bc178e8
..
7a08470
100644
(file)
--- a/
mergetools/meld
+++ b/
mergetools/meld
@@
-10,7
+10,7
@@
merge_cmd () {
if test "$meld_has_output_option" = true
then
- "$merge_tool_path" --output
"$MERGED" \
+ "$merge_tool_path" --output
=
"$MERGED" \
"$LOCAL" "$BASE" "$REMOTE"
else
"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"