X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=.gitignore;h=d706dd92c6a63474616c09388fc9744ff055cedc;hb=aa1cef54a2bcc5350df7efe1d1745725c46bf2e3;hp=4c8c8e411500fe2ed0108c46838d50576ed15185;hpb=7854e526ff170846aef4ae3c71588c98ed9176d0;p=git.git

diff --git a/.gitignore b/.gitignore
index 4c8c8e411..d706dd92c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,13 +60,13 @@ git-mailsplit
 git-merge
 git-merge-base
 git-merge-index
+git-merge-file
 git-merge-tree
 git-merge-octopus
 git-merge-one-file
 git-merge-ours
 git-merge-recur
 git-merge-recursive
-git-merge-recursive-old
 git-merge-resolve
 git-merge-stupid
 git-mktag