kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Felipe Contreras	7c147b77d3	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-22 12:49:07 -07:00

Author

SHA1

Message

Date

Felipe Contreras

7c147b77d3

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-22 12:49:07 -07:00

1 Commits (47d4ac019bbd176730e538b68bae51f65eead4b3)