mirror of
https://github.com/git/git.git
synced 2024-10-31 22:37:54 +01:00
7c147b77d3
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>
1 line
29 B
Text
1 line
29 B
Text
. "$MERGE_TOOLS_DIR/vimdiff"
|