user/sven/git.git/mergetools/vimdiff, branch v2.7.0-rc2Git
https://git.stealer.net/cgit.cgi/user/sven/git.git/atom?h=v2.7.0-rc22014-04-22T19:49:07Zmergetools: add vimdiff3 mode2014-04-22T19:49:07ZFelipe Contrerasfelipe.contreras@gmail.com2014-04-21T00:24:20Zurn:sha1:7c147b77d34f072c40b912fafba499727921fa6e
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>
mergetools: simplify how we handle "vim" and "defaults"2013-01-29T03:00:38ZDavid Aguilardavvid@gmail.com2013-01-27T00:46:12Zurn:sha1:073678b8e6324a155fa99f40eee0637941a70a34
Remove the exceptions for "vim" and "defaults" in the mergetool library
so that every filename in mergetools/ matches 1:1 with the name of a
valid built-in tool.
Define the trivial fallback definition of shell functions in-line in
git-mergetool-lib script, instead of dot-sourcing them from another
file. The result is much easier to follow.
[jc: squashed in an update from John Keeping as well]
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>