Merge branch 'dr/ceiling'
[git/git.git] / .gitignore
index 31ea9f1..a213e8e 100644 (file)
@@ -75,7 +75,6 @@ git-merge-one-file
 git-merge-ours
 git-merge-recursive
 git-merge-resolve
-git-merge-stupid
 git-merge-subtree
 git-mergetool
 git-mktag