contrib / credential / netrc / test.netrc.gpgon commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1