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