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	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
bc
bc3	mergetool: rename bc3 to bc	2014-10-21 11:25:30 -07:00
codecompare
deltawalker	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
diffmerge
diffuse
ecmerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
emerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
examdiff	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
guiffy	mergetools: add support for guiffy	2018-04-06 08:11:39 +09:00
gvimdiff	mergetools: simplify how we handle "vim" and "defaults"	2013-01-28 19:00:38 -08:00
gvimdiff2	mergetools: simplify how we handle "vim" and "defaults"	2013-01-28 19:00:38 -08:00
gvimdiff3	mergetools: add vimdiff3 mode	2014-04-22 12:49:07 -07:00
kdiff3	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
kompare
meld
opendiff	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
p4merge
smerge	mergetools: add support for smerge (Sublime Merge)	2019-04-04 18:21:25 +09:00
tkdiff
tortoisemerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
vimdiff	mergetools/vimdiff: trust Vim's exit code	2016-11-29 10:57:41 -08:00
vimdiff2	mergetools: simplify how we handle "vim" and "defaults"	2013-01-28 19:00:38 -08:00
vimdiff3	mergetools: add vimdiff3 mode	2014-04-22 12:49:07 -07:00
winmerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
xxdiff	Merge branch 'da/mergetool-xxdiff-hotkey'	2016-12-19 14:45:41 -08:00