Thread (1 message) 1 message, 1 author, 2018-05-25

Re: [RFC/PATCH 4/7] rerere: fix crash when conflict goes unresolved

From: Junio C Hamano <hidden>
Date: 2018-05-25 01:20:32

Thomas Gummerer [off-list ref] writes:
Sorry I botched the description here, and failed to describe what the
code is actually doing.  We're actually only removing the variant in
the MERGE_RR file, whose path we are now no longer able to handle.
Oh, that's absolutely fine, then.  Thanks for a prompt update.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help