diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-13 22:30:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-13 22:30:13 -0700 |
| commit | 4803c2802c11525b11d106247661ea13b2a9ce98 (patch) | |
| tree | 413a2727a9e0cf9e8d7b6b8ba642c8527be44961 /Makefile | |
| parent | 3db6b224cf36748b969acdd96b9fb2de641cd641 (diff) | |
| parent | 2ba6c47be1762726ad0c1d5779064c489150d789 (diff) | |
| download | git-4803c2802c11525b11d106247661ea13b2a9ce98.tar.gz git-4803c2802c11525b11d106247661ea13b2a9ce98.tar.xz | |
Merge branch 'master' of .
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 = \ |