Allow configurable file extensions for merge conflicts
[stgit] / doc / .gitignore
1 tutorial.html
2 tutorial.pdf