From 0af85f84bd6d1755b3b8559ccfd99383c2928ac3 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sun, 18 Jun 2017 19:10:33 -0700 Subject: mergetools/meld: improve compatibiilty with Meld on macOS X The macOS X fork of Meld[1] requires a "=" in the "--output" argument, as it uses a wrapper[2] script that munges the "--output" argument before calling into the common "meld" script. The macOS X wrapper script[2] accepts "--output=" only, despite the fact that the underlying meld code accepts both "--output "[3]. All versions of meld which accept "--output" accept it in the "--output=" form, so use "--output=" for maximum compatibility. [1] https://github.com/yousseb/meld [2] https://github.com/yousseb/meld/blob/master/osx/Meld [3] https://github.com/yousseb/meld/issues/42 Reported-by: Matthew Groth Helped-by: Samuel Lijin Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- mergetools/meld | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mergetools') diff --git a/mergetools/meld b/mergetools/meld index bc178e888..7a08470f8 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" -- cgit v1.2.1