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 --- git-merge.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'git-merge.sh') diff --git a/git-merge.sh b/git-merge.sh index 9926e45d1a..55b0c7269e 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -12,10 +12,10 @@ usage () { die "git-merge [-n] [-s ]... +" } -# all_strategies='resolve multibase fredrik octopus' +# all_strategies='resolve fredrik stupid octopus' -all_strategies='resolve multibase octopus' -default_strategies='resolve multibase octopus' +all_strategies='resolve octopus stupid' +default_strategies='resolve octopus' use_strategies= dropheads() { -- cgit v1.2.3