diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-24 21:28:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-24 21:28:36 (GMT) |
| commit | 6bbd512374133ff3c1c6b17e080a466b6485ed42 (patch) | |
| tree | c75071a7ac9aeb92d97bb76d82b588bf9753b0f8 | |
| parent | 6ba4d62ba8fb00310df6e6cc0d4437871106c5ed (diff) | |
| parent | 0af85f84bd6d1755b3b8559ccfd99383c2928ac3 (diff) | |
| download | git-6bbd512374133ff3c1c6b17e080a466b6485ed42.zip git-6bbd512374133ff3c1c6b17e080a466b6485ed42.tar.gz git-6bbd512374133ff3c1c6b17e080a466b6485ed42.tar.bz2 | |
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 bc178e8..7a08470 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" |