undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6a67c75948
git-commit-vandalism/mergetools/vimdiff3

2 lines
29 B
Plaintext
Raw Normal View History

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-21 02:24:20 +02:00
. "$MERGE_TOOLS_DIR/vimdiff"
Reference in New Issue Copy Permalink