git-merge: fail correctly when we cannot fast forward.
[git/gitweb.git] / t / .gitignore
blobfad67c097b08c695c57c376946f3093f487d4358
1 trash