mirror of
https://github.com/git/git.git
synced 2024-10-31 06:17:56 +01:00
f61bd9c68a
meld 1.5.0 and newer allow the output file to be specified when merging multiple files. Check whether the meld command supports '--output' and use it when available. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> |
||
---|---|---|
.. | ||
araxis | ||
bc3 | ||
defaults | ||
diffuse | ||
ecmerge | ||
emerge | ||
kdiff3 | ||
kompare | ||
meld | ||
opendiff | ||
p4merge | ||
tkdiff | ||
tortoisemerge | ||
vim | ||
xxdiff |