diff --git a/.gitignore b/.gitignore
index d49994903e33744294edf494a7e18ebba6519e95..d99372afc48a96e73da49b1f0787861efaeac1ee 100644 (file)
--- a/.gitignore
+++ b/.gitignore
git-merge-octopus
git-merge-one-file
git-merge-ours
-git-merge-recur
git-merge-recursive
git-merge-resolve
git-merge-stupid