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>
2005-09-10 17:56:19 -07:00
parent 91063bbc6c
commit 2276aa6c09
4 changed files with 88 additions and 39 deletions
--- a/git-merge.sh
+++ b/git-merge.sh
@ -12,10 +12,10 @@ usage () {
    die "git-merge [-n] [-s <strategy>]... <merge-message> <head> <remote>+"
 }

-# 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() {