1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-19 07:06:09 +02:00
git/mergetools
David Aguilar b2a6b7122e mergetools/vim: remove redundant diff command
vimdiff and vimdiff2 differ only by their merge command so remove the
logic in the diff command since it's not actually needed.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-27 18:32:43 -08:00
..
araxis
bc3 mergetools: use the correct tool for Beyond Compare 3 on Windows 2011-10-15 20:13:55 -07:00
codecompare Add Code Compare v2.80.4 as a merge / diff tool for Windows 2012-08-10 08:08:08 -07:00
defaults mergetool--lib: Allow custom commands to override built-ins 2012-09-25 09:04:39 -07:00
deltawalker mergetools: add a plug-in to support DeltaWalker 2012-03-05 09:31:47 -08:00
diffuse
ecmerge
emerge
kdiff3
kompare
meld mergetools/meld: Use --help output to detect --output support 2012-02-10 14:53:18 -08:00
opendiff
p4merge
tkdiff
tortoisemerge
vim mergetools/vim: remove redundant diff command 2013-01-27 18:32:43 -08:00
xxdiff