git-merge: Don't use -p when outputting summary
[git/dscho.git] / t / .gitignore
blobfad67c097b08c695c57c376946f3093f487d4358
1 trash