git/mergetools at 8279ed033f703d4115bee620dccd32a9ec94d9aa - git

Tree: 8279ed033f

David Aguilar 0af85f84bd 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=<filename>" only, despite the fact that the underlying meld code accepts both "--output <filename" and "--output=<filename>"[3]. All versions of meld which accept "--output" accept it in the "--output=<filename>" form, so use "--output=<file>" 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 <mgroth49@gmail.com> Helped-by: Samuel Lijin <sxlijin@gmail.com> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		7 years ago
..
araxis	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
bc	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
bc3	…
codecompare	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
deltawalker	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
diffmerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
diffuse	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
ecmerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
emerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
examdiff	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
gvimdiff	…
gvimdiff2	…
gvimdiff3	…
kdiff3	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
kompare	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
meld	mergetools/meld: improve compatibiilty with Meld on macOS X	7 years ago
opendiff	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
p4merge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
tkdiff	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
tortoisemerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
vimdiff	mergetools/vimdiff: trust Vim's exit code	8 years ago
vimdiff2	…
vimdiff3	…
winmerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	8 years ago
xxdiff	Merge branch 'da/mergetool-xxdiff-hotkey'	8 years ago