X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=.gitignore;h=31c03f468bedafefe4c8d6dde1bc80e733cb4b62;hb=e4cf17ce0db2dab7c9525a732f86c5e3df3b4ed0;hp=cc2b29ebfca5beb2a962681a045660972257b9da;hpb=f88ed172e7a391bd907798ad2a3347a83cd24317;p=git.git

diff --git a/.gitignore b/.gitignore
index cc2b29eb..31c03f46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,10 +44,10 @@ git-mailinfo
 git-mailsplit
 git-merge
 git-merge-base
-git-merge-fredrik
 git-merge-index
 git-merge-octopus
 git-merge-one-file
+git-merge-recursive
 git-merge-resolve
 git-merge-stupid
 git-mktag