t / t5100 / msg0009on commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1This is to fix diff-format documentation.
   2