[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>

1 files changed, 1 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 9c2bdd642b..a851f56466 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ SCRIPT_PERL = \
 	git-rename.perl git-shortlog.perl
 
 SCRIPT_PYTHON = \
-	git-merge-fredrik.py
+	git-merge-recursive.py
 
 # The ones that do not have to link with lcrypto nor lz.
 SIMPLE_PROGRAMS = \