Git https://git.stealer.net/cgit.cgi/user/sven/git.git/atom?h=v2.26.0-rc2 2014-04-22T19:49:07Z 2014-04-22T19:49:07Z Felipe Contreras felipe.contreras@gmail.com 2014-04-21T00:24:20Z urn:sha1:7c147b77d34f072c40b912fafba499727921fa6e 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>