diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-07-24 15:08:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-24 15:08:05 -0700 |
| commit | 5eda906b2873c986fa61406dafb6acd99e70d540 (patch) | |
| tree | c5a39d79274fe6d68e7659ca9fb0e9ad983ae3e3 /git-gui/lib | |
| parent | rerere: fix an off-by-one non-bug (diff) | |
| download | tgif-5eda906b2873c986fa61406dafb6acd99e70d540.tar.xz | |
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>
Diffstat (limited to 'git-gui/lib')
0 files changed, 0 insertions, 0 deletions