Merge branch 'so/log-diff-merges-opt'
[git] / contrib / credential / netrc / test.netrc.gpg