Revert "Use git-merge instead of git-resolve in git-pull."
[git/gitweb.git] / Documentation / .gitignore
blobdad52b80d35caed744cd94399054b6126bfa43bf
1 *.xml
2 *.html
3 *.1
4 *.7
5 howto-index.txt