Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
travis-ci: record and skip successfully built trees
[gitweb.git]
/
mergetools
/
meld
diff --git
a/mergetools/meld
b/mergetools/meld
index bc178e88827a1a0558e9fbee1a6f18f6ede83df1..7a08470f8836e14824a215b29e0c3a5dbeba9c17 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"