From 2276aa6c098a0337bc2bec49742e332bdd1b802c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 10 Sep 2005 17:56:19 -0700 Subject: 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 --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7ef9861a7d..41461fa816 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 \ -- cgit v1.2.3