Jacob Nisnevich 35d62bbe3e mergetools: add support for ExamDiff ...

Signed-off-by: Jacob Nisnevich <jacob.nisnevich@gmail.com>
Acked-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2016-04-04 09:15:14 -07:00

..

araxis

…

bc

mergetool: rename bc3 to bc

2014-10-21 11:25:30 -07:00

bc3

mergetool: rename bc3 to bc

2014-10-21 11:25:30 -07:00

codecompare

…

deltawalker

…

diffmerge

mergetools: stop setting $status in merge_cmd()

2014-11-21 11:27:53 -08:00

diffuse

…

ecmerge

…

emerge

mergetools: stop setting $status in merge_cmd()

2014-11-21 11:27:53 -08:00

examdiff

mergetools: add support for ExamDiff

2016-04-04 09:15:14 -07:00

gvimdiff

…

gvimdiff2

…

gvimdiff3

mergetools: add vimdiff3 mode

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

kdiff3

mergetools: stop setting $status in merge_cmd()

2014-11-21 11:27:53 -08:00

kompare

…

meld

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

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

opendiff

…

p4merge

…

tkdiff

…

tortoisemerge

…

vimdiff

mergetool: reorder vim/gvim buffers in three-way diffs

2016-02-12 10:14:09 -08:00

vimdiff2

…

vimdiff3

mergetools: add vimdiff3 mode

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

winmerge

mergetools: create mergetool_find_win32_cmd() helper function for winmerge

2016-04-04 09:15:00 -07:00

xxdiff

…