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

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index 5b028b1..a851f56 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -76,14 +76,14 @@ SCRIPT_SH = \
        git-tag.sh git-verify-tag.sh git-whatchanged.sh git.sh \
        git-applymbox.sh git-applypatch.sh \
        git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
-       git-merge-resolve.sh
+       git-merge-resolve.sh git-grep.sh
 
 SCRIPT_PERL = \
        git-archimport.perl git-cvsimport.perl git-relink.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 = \