.gitignore: git-merge-recur is a built file.

diff --git a/.gitignore b/.gitignore
index 52d61f31939d4fbbd55521cff85939fd1cf97e28..2299e36ba9b61f081a96ce6b28f94974311d721c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ git-merge-tree
 git-merge-octopus
 git-merge-one-file
 git-merge-ours
+git-merge-recur
 git-merge-recursive
 git-merge-resolve
 git-merge-stupid
@@ -137,4 +138,10 @@ git-core.spec
 *.[ao]
 *.py[co]
 config.mak
+autom4te.cache
+config.log
+config.status
+config.mak.in
+config.mak.autogen
+configure
 git-blame