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

diff --git a/Makefile b/Makefile
index 9c2bdd642bd7b3e142512f1b71780273351ca514..a851f56466b3867534693f12b204441ba0537614 100644 (file)
--- 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 = \