Felipe Contreras 7c147b77d3 mergetools: add vimdiff3 mode ... It's similar to the default, except that the other windows are hidden. This ensures that removed/added colors are still visible on the main merge window, but the other windows not visible. Specially useful with merge.conflictstyle=diff3. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Acked-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2014-04-22 12:49:07 -07:00
..
araxis
bc3
codecompare
deltawalker
diffmerge	mergetools/diffmerge: support DiffMerge as a git mergetool	2013-10-13 16:00:57 -07:00
diffuse
ecmerge
emerge
gvimdiff
gvimdiff2
gvimdiff3	mergetools: add vimdiff3 mode	2014-04-22 12:49:07 -07:00
kdiff3
kompare
meld
opendiff
p4merge
tkdiff
tortoisemerge
vimdiff	mergetools: add vimdiff3 mode	2014-04-22 12:49:07 -07:00
vimdiff2
vimdiff3	mergetools: add vimdiff3 mode	2014-04-22 12:49:07 -07:00
xxdiff