Merge branch 'en/merge-path-collision'
[git] / contrib / credential / netrc / test.netrc.gpg