contrib / credential / netrc / test.netrc.gpgon commit merge-recursive: switch from (oid,mode) pairs to a diff_filespec (8daec1d)
   1