X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=.gitignore;h=a213e8e25bb2442326e86cbfb9ef56319f482869;hb=452d36b1f33e10a9492eb2adad357108b26ea381;hp=4ff2fec2785d21055bdcb5d9661d5090624b92da;hpb=a6828f536119c3288b0be772e3870f1a464d017d;p=git.git

diff --git a/.gitignore b/.gitignore
index 4ff2fec27..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
@@ -150,6 +148,7 @@ test-dump-cache-tree
 test-genrandom
 test-match-trees
 test-parse-options
+test-path-utils
 test-sha1
 common-cmds.h
 *.tar.gz