[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.

diff --git a/.gitignore b/.gitignore
index cc2b29ebfca5beb2a962681a045660972257b9da..31c03f468bedafefe4c8d6dde1bc80e733cb4b62 100644 (file)
--- 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