diff-merges: let new options enable diff without -p
[git] / contrib / credential / netrc / test.netrc.gpg