undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6881f0ccb4
git-commit-vandalism/mergetools
History
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 mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
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
deltawalker mergetools: add a plug-in to support DeltaWalker 2012-03-05 09:31:47 -08:00
diffmerge mergetools/diffmerge: support DiffMerge as a git mergetool 2013-10-13 16:00:57 -07:00
diffuse mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
ecmerge mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
emerge mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07: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 mergetools/kdiff3: do not use --auto when diffing 2013-05-09 11:59:39 -07:00
kompare mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
meld mergetools/meld: Use --help output to detect --output support 2012-02-10 14:53:18 -08:00
opendiff mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
p4merge mergetools/p4merge: create a base if none available 2013-03-13 10:46:07 -07:00
tkdiff mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
tortoisemerge mergetools: teach tortoisemerge to handle filenames with SP correctly 2013-02-01 18:06:03 -08:00
vimdiff mergetools: add vimdiff3 mode 2014-04-22 12:49:07 -07: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
xxdiff mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00