summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 9926e45..55b0c72 100755
--- 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() {