X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=818e6b772d30c060020640deb051f2428e2c9fe5;hb=e4cf17ce0db2dab7c9525a732f86c5e3df3b4ed0;hp=e51e73499a1cf65cec94ed7f0134e3abc72435a6;hpb=f88ed172e7a391bd907798ad2a3347a83cd24317;p=git.git diff --git a/git-merge.sh b/git-merge.sh index e51e7349..818e6b77 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -12,9 +12,9 @@ usage () { die "git-merge [-n] [-s ]... +" } -# all_strategies='resolve fredrik stupid octopus' +# all_strategies='resolve recursive stupid octopus' -all_strategies='fredrik octopus resolve stupid' +all_strategies='recursive octopus resolve stupid' default_strategies='resolve octopus' use_strategies=