Add support for launching git-mergetool from the status view

[tig.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 4469f10149b14689ee61efdc5893175b9d1eb1bb..ad063e2c3187ec922ee87df98ce1007219774d77 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+aclocal.m4
 autom4te.cache
 config.h
 config.h.in
@@ -10,8 +11,10 @@ manual.pdf
 manual.toc
 tig
 tig-*.tar.gz
+tig-*.tar.gz.md5
 tig.1
 tig.1.html
 tig.spec
 tigrc.5
 tigrc.5.html
+*.o