contrib / credential / netrc / test.netrc.gpgon commit rerere: teach rerere to handle nested conflicts (4af3220)
   1