]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fb70a06) | patch
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)
commit5eda906b2873c986fa61406dafb6acd99e70d540
treec5a39d79274fe6d68e7659ca9fb0e9ad983ae3e3tree
parentfb70a06da2f10e8b3255abd76cd6ec1926bd9a40commit | diff
rerere: handle conflicts with multiple stage #1 entries

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>
rerere.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.