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)
commit5eda906...2873c986fa61406dafb6acd99e70d540
treec5a39d7...274fe6d68e7659ca9fb0e9ad983ae3e3copy hash to clipboard (tree)
parentfb70a06...a2f10e8b3255abd76cd6ec1926bd9a40copy hash to clipboard (diff)
rerere.c