t / t5100 / msg0001on commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1Here is a patch from A U Thor.
   2