git/mergetools
David Aguilar f61bd9c68a mergetools/meld: Use '--output' when available
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>
2011-08-19 10:52:16 -07:00
..
araxis mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
bc3 mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
defaults mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
diffuse mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
ecmerge mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
emerge mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
kdiff3 mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
kompare mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
meld mergetools/meld: Use '--output' when available 2011-08-19 10:52:16 -07:00
opendiff mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
p4merge mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
tkdiff mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
tortoisemerge mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
vim mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
xxdiff mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00