diff --git a/.gitignore b/.gitignore
index 4c8c8e411500fe2ed0108c46838d50576ed15185..d706dd92c6a63474616c09388fc9744ff055cedc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
git-merge
git-merge-base
git-merge-index
+git-merge-file
git-merge-tree
git-merge-octopus
git-merge-one-file
git-merge-ours
git-merge-recur
git-merge-recursive
-git-merge-recursive-old
git-merge-resolve
git-merge-stupid
git-mktag