undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
git-commit-vandalism/mergetools
History
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
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
bc3
mergetool: rename bc3 to bc
2014-10-21 11:25:30 -07:00
codecompare
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
deltawalker
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
diffmerge
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
diffuse
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
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
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
meld
mergetools/meld: improve compatibiilty with Meld on macOS X
2017-06-18 22:11:29 -07:00
opendiff
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
p4merge
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
smerge
mergetools: add support for smerge (Sublime Merge)
2019-04-04 18:21:25 +09:00
tkdiff
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
2016-11-29 10:54:03 -08:00
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