git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-02-04 03:33:01 -06:00
Code Issues Packages Projects Releases 335 Wiki Activity
git/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
…
bc
…
bc3
…
codecompare
…
deltawalker
…
diffmerge
…
diffuse
…
ecmerge
…
emerge
…
examdiff
…
guiffy
…
gvimdiff
…
gvimdiff2
…
gvimdiff3
…
kdiff3
…
kompare
…
meld
…
opendiff
…
p4merge
…
smerge
mergetools: add support for smerge (Sublime Merge)
2019-04-04 18:21:25 +09:00
tkdiff
…
tortoisemerge
…
vimdiff
…
vimdiff2
…
vimdiff3
…
winmerge
…
xxdiff
…