mirror of
https://github.com/git/git.git
synced 2024-11-01 14:57:52 +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> |
||
|---|---|---|
| .. | ||
| araxis | ||
| bc3 | ||
| codecompare | ||
| deltawalker | ||
| diffmerge | ||
| diffuse | ||
| ecmerge | ||
| emerge | ||
| gvimdiff | ||
| gvimdiff2 | ||
| gvimdiff3 | ||
| kdiff3 | ||
| kompare | ||
| meld | ||
| opendiff | ||
| p4merge | ||
| tkdiff | ||
| tortoisemerge | ||
| vimdiff | ||
| vimdiff2 | ||
| vimdiff3 | ||
| xxdiff | ||