summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2005-09-13 06:22:26 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-13 07:20:54 (GMT)
commite4cf17ce0db2dab7c9525a732f86c5e3df3b4ed0 (patch)
treee311046e26ff830a2232067e6ad00ba06db95e2d /Makefile
parentf88ed172e7a391bd907798ad2a3347a83cd24317 (diff)
downloadgit-e4cf17ce0db2dab7c9525a732f86c5e3df3b4ed0.zip
git-e4cf17ce0db2dab7c9525a732f86c5e3df3b4ed0.tar.gz
git-e4cf17ce0db2dab7c9525a732f86c5e3df3b4ed0.tar.bz2
[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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9c2bdd6..a851f56 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 = \