t / t5100 / msg0008on commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1>Here is an empty patch from A U Thor.
   2
   3Hey you forgot the patch!
   4