Question on rerere

From: Johannes Schindelin <hidden>
Date: 2016-08-11 19:44:02

Hi,

while studying the code of rerere I found myself wondering if the code of 
compute_conflict_name and record_preimage is correct.

IIUC then each conflict hunk is handled _separately_ like this: the 
lexicographically smaller between the two file sections is displayed 
first, regardless if a previous hunk had a different order. Not that it 
matters most of the time, but isn't this dangerous?

Ciao,
Dscho
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help