mirrors/git - git - ClassFun

mirrors/git

mirror of https://github.com/git/git.git synced 2024-12-13 03:44:17 +08:00

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 08:24:20 +08:00

. "$MERGE_TOOLS_DIR/vimdiff"