Andrew's git / gitweb.git / diff
?
rerere: handle conflicts with multiple stage #1 entries
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Jul 2015 22:08:03 +0000 (15:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Jul 2015 22:08:05 +0000 (15:08 -0700)
A conflicted index can have multiple stage #1 entries when dealing
with a criss-cross merge and using the "resolve" merge strategy.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found