Re: [PATCH] mergetools: add vimdiff3 mode

2014-04-22 Thread Junio C Hamano
David Aguilar writes: > On Sun, Apr 20, 2014 at 07:24:20PM -0500, Felipe Contreras wrote: >> 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. >> >> Sp

Re: [PATCH] mergetools: add vimdiff3 mode

2014-04-21 Thread David Aguilar
On Sun, Apr 20, 2014 at 07:24:20PM -0500, Felipe Contreras wrote: > 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.confl

[PATCH] mergetools: add vimdiff3 mode

2014-04-20 Thread Felipe Contreras
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 --- How a conflict looks: