development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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-06-24 14:28:36 -07:00
parent 6ba4d62ba8 0af85f84bd
commit 6bbd512374
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
then
"$merge_tool_path" --output "$MERGED" \
"$merge_tool_path" --output="$MERGED" \
"$LOCAL" "$BASE" "$REMOTE"
else
"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"