David Aguilar eb12adc74c mergetools: add support for smerge (Sublime Merge) ...

Teach difftool and mergetool about the Sublime Merge "smerge" command.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2019-04-04 18:21:25 +09:00

..

araxis

…

bc

…

bc3

…

codecompare

…

deltawalker

…

diffmerge

…

diffuse

…

ecmerge

…

emerge

…

examdiff

…

guiffy

mergetools: add support for guiffy

2018-04-06 08:11:39 +09:00

gvimdiff

…

gvimdiff2

…

gvimdiff3

…

kdiff3

…

kompare

…

meld

mergetools/meld: improve compatibiilty with Meld on macOS X

2017-06-18 22:11:29 -07:00

opendiff

…

p4merge

…

smerge

mergetools: add support for smerge (Sublime Merge)

2019-04-04 18:21:25 +09:00

tkdiff

…

tortoisemerge

…

vimdiff

mergetools/vimdiff: trust Vim's exit code

2016-11-29 10:57:41 -08:00

vimdiff2

…

vimdiff3

…

winmerge

…

xxdiff

Merge branch 'da/mergetool-xxdiff-hotkey'

2016-12-19 14:45:41 -08:00