Andrew's git / gitweb.git / t/t5100/0002mboxrd
?
t / t5100 / 0002mboxrdon commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1 >From unchanged
   2 From also unchanged
   3no trailing space, no escaping necessary and '>' was intended:
   4>From
   5