mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
![Felipe Contreras](/assets/img/avatar_default.png)
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>
2 lines
29 B
Plaintext
2 lines
29 B
Plaintext
. "$MERGE_TOOLS_DIR/vimdiff"
|