contrib / credential / netrc / test.netrc.gpgon commit rebase: implement --merge via the interactive machinery (68aa495)
   1