t / t5100 / msg0018on commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1a commit message
   2