summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-14 05:30:13 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-14 05:30:13 (GMT)
commit4803c2802c11525b11d106247661ea13b2a9ce98 (patch)
tree413a2727a9e0cf9e8d7b6b8ba642c8527be44961 /Makefile
parent3db6b224cf36748b969acdd96b9fb2de641cd641 (diff)
parent2ba6c47be1762726ad0c1d5779064c489150d789 (diff)
downloadgit-4803c2802c11525b11d106247661ea13b2a9ce98.zip
git-4803c2802c11525b11d106247661ea13b2a9ce98.tar.gz
git-4803c2802c11525b11d106247661ea13b2a9ce98.tar.bz2
Merge branch 'master' of .
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e2bbcb5..9725b1a 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 = \