[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
Otherwise we would regret when Fredrik comes up with another merge
algorithm with different pros-and-cons with the current one.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
diff --git a/.gitignore b/.gitignore
index cc2b29e..31c03f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,10 +44,10 @@
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
