t / t5100 / msg0015--no-inbody-headerson commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1From: bogosity
   2  - a list
   3  - of stuff