Show a failure of rebase -p if the merge had a conflict
[git/platforms.git] / Documentation / .gitattributes
blobddb030137d54ef3fb0ee01d973ec5cee4bb2b2b3
1 *.txt whitespace