t / t5100 / patch0007on commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1