t / t5100 / msg0016on commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1and some content
   2