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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html