projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
[git.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
9c2bdd6
..
a851f56
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 = \