[PATCH] Don't output 'Automatic merge failed, ...'
[git/wpalmer.git] / templates / .gitignore
blobca680c5b9c59ed5327f8ba447c1525253c8d2222
1 blt