David Aguilar b12d04503b mergetools/meld: make usage of --output configurable and more robust ...

Older versions of meld listed --output in `meld --help`.
Newer versions only mention `meld [OPTIONS...]`.
Improve the checks to catch these newer versions.

Add a `mergetool.meld.hasOutput` configuration to allow
overriding the heuristic.

Reported-by: Andrey Novoseltsev <novoselt@gmail.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2014-10-16 11:58:11 -07:00

..

araxis

…

bc3

…

codecompare

…

deltawalker

…

diffmerge

mergetools/diffmerge: support DiffMerge as a git mergetool

2013-10-13 16:00:57 -07:00

diffuse

…

ecmerge

…

emerge

…

gvimdiff

…

gvimdiff2

…

gvimdiff3

mergetools: add vimdiff3 mode

2014-04-22 12:49:07 -07:00

kdiff3

mergetools/kdiff3: do not use --auto when diffing

2013-05-09 11:59:39 -07:00

kompare

…

meld

mergetools/meld: make usage of --output configurable and more robust

2014-10-16 11:58:11 -07:00

opendiff

…

p4merge

mergetools/p4merge: create a base if none available

2013-03-13 10:46:07 -07:00

tkdiff

…

tortoisemerge

…

vimdiff

mergetools: add vimdiff3 mode

2014-04-22 12:49:07 -07:00

vimdiff2

…

vimdiff3

mergetools: add vimdiff3 mode

2014-04-22 12:49:07 -07:00

xxdiff

…