From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 19 Dec 2006 23:53:38 GMT
Subject: Question on rerere
Message-ID: <Pine.LNX.4.63.0612200045490.19693@wbgn013.biozentrum.uni-wuerzburg.de>

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