RelNoteson commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1Documentation/RelNotes/2.19.0.txt