This website works better with JavaScript.
Explore
Register
Sign In
kernel
/
git
mirror of
https://git.kernel.org/pub/scm/git/git.git
Watch
1
Star
0
Fork
You've already forked git
0
Code
Releases
Activity
50177
Commits
6
Branches
36
Tags
131 MiB
Tree:
0a0dd632aa
git
/
mergetools
/
vimdiff3
2 lines
29 B
Raw
Normal View
History
Unescape
Escape
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>
11 years ago
. "$MERGE_TOOLS_DIR/vimdiff"