diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-06-24 14:28:36 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-06-24 14:28:36 -0700 |
commit | 6bbd512374133ff3c1c6b17e080a466b6485ed42 (patch) | |
tree | c75071a7ac9aeb92d97bb76d82b588bf9753b0f8 | |
parent | Merge branch 'nd/split-index-unshare' (diff) | |
parent | mergetools/meld: improve compatibiilty with Meld on macOS X (diff) | |
download | tgif-6bbd512374133ff3c1c6b17e080a466b6485ed42.tar.xz |
Merge branch 'da/mergetools-meld-output-opt-on-macos'
"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
-rw-r--r-- | mergetools/meld | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mergetools/meld b/mergetools/meld index bc178e8882..7a08470f88 100644 --- 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" |