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

diff --git a/.gitignore b/.gitignore
index be9ea5fa9c1a2476744c5d9a0b1f4c919f4f485d..31c03f468bedafefe4c8d6dde1bc80e733cb4b62 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ git-fetch-pack
 git-format-patch
 git-fsck-objects
 git-get-tar-commit-id
+git-grep
 git-hash-object
 git-http-fetch
 git-init-db
@@ -43,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