diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2014-04-20 19:24:20 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-22 12:49:07 -0700 |
| commit | 7c147b77d34f072c40b912fafba499727921fa6e (patch) | |
| tree | d74950fe1df88876d77fbe9e4122bd1bddd9878a /rerere.h | |
| parent | 0bc85abb7aa9b24b093253018801a0fb43d01122 (diff) | |
| download | git-7c147b77d34f072c40b912fafba499727921fa6e.tar.gz git-7c147b77d34f072c40b912fafba499727921fa6e.tar.xz | |
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>
Diffstat (limited to 'rerere.h')
0 files changed, 0 insertions, 0 deletions