X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=.gitignore;h=a213e8e25bb2442326e86cbfb9ef56319f482869;hb=ea3594e04184475226109a21e71c539ff5f139fd;hp=c54c473e94f247823487f91d327dcf7a2dcd5b19;hpb=ae299be0e5e610027e6492d48d70c1cbb0e9edd8;p=git.git

diff --git a/.gitignore b/.gitignore
index c54c473e9..a213e8e25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
@@ -142,7 +141,6 @@ git-write-tree
 git-core-*/?*
 gitk-wish
 gitweb/gitweb.cgi
-test-absolute-path
 test-chmtime
 test-date
 test-delta