Johannes Sixt <j.sixt@xxxxxxxxxxxxx> writes: > Am 7/2/2010 19:25, schrieb Junio C Hamano: > >> I'd rather see "preimage" >> timestamp to keep track of the time when we _first_ encountered the >> particular conflict, and "postimage" used for recording the time when we >> saw the conflict most recently. > > That would be fine, too. Ok, then let's make it so ;-) -- 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