summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-11 00:56:19 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-11 01:30:41 (GMT)
commit2276aa6c098a0337bc2bec49742e332bdd1b802c (patch)
treebc43b357a46843c2efa0d1e3b4f55fe667b09824 /Makefile
parent91063bbc6c4187184e94ebc4ab2b807e6d53cd0a (diff)
downloadgit-2276aa6c098a0337bc2bec49742e332bdd1b802c.zip
git-2276aa6c098a0337bc2bec49742e332bdd1b802c.tar.gz
git-2276aa6c098a0337bc2bec49742e332bdd1b802c.tar.bz2
Use Daniel's read-tree in the merge strategy 'resolve'.
And rename the one Linus kept calling stupid, 'stupid'. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 7ef9861..41461fa 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,8 @@ SCRIPT_SH = \
git-resolve.sh git-revert.sh git-sh-setup.sh git-status.sh \
git-tag.sh git-verify-tag.sh git-whatchanged.sh git.sh \
git-applymbox.sh git-applypatch.sh \
- git-merge.sh git-merge-resolve.sh git-merge-octopus.sh
+ git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
+ git-merge-resolve.sh
SCRIPT_PERL = \
git-archimport.perl git-cvsimport.perl git-relink.perl \