summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 55b0c72..a784e0f 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -14,7 +14,7 @@ usage () {
# all_strategies='resolve fredrik stupid octopus'
-all_strategies='resolve octopus stupid'
+all_strategies='fredrik octopus resolve stupid'
default_strategies='resolve octopus'
use_strategies=