undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'da/mergetools-meld-output-opt-on-macos' into maint

Browse Source 
"git mergetool" learned to work around a wrapper MacOS X adds
around underlying meld.

* da/mergetools-meld-output-opt-on-macos:
  mergetools/meld: improve compatibiilty with Meld on macOS X
This commit is contained in:
Junio C Hamano 2017-07-10 13:58:56 -07:00
commit 311b760b8f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mergetools/meld
View File

@ -10,7 +10,7 @@ merge_cmd () {
if test "$meld_has_output_option" = true if test "$meld_has_output_option" = true
then then
"$merge_tool_path" --output "$MERGED" \ "$merge_tool_path" --output="$MERGED" \
"$LOCAL" "$BASE" "$REMOTE" "$LOCAL" "$BASE" "$REMOTE"
else else
"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"