diff --git a/.gitignore b/.gitignore
index c54c473e94f247823487f91d327dcf7a2dcd5b19..a213e8e25bb2442326e86cbfb9ef56319f482869 100644 (file)
--- a/.gitignore
+++ b/.gitignore
git-merge-ours
git-merge-recursive
git-merge-resolve
-git-merge-stupid
git-merge-subtree
git-mergetool
git-mktag
git-core-*/?*
gitk-wish
gitweb/gitweb.cgi
-test-absolute-path
test-chmtime
test-date
test-delta