X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-merge.sh;h=a784e0f2cc5935a68795cb9f5ecf1b13716477f6;hb=e1ccf53a60657930ae7892387736c8b6a91ec610;hp=55b0c7269e9234a849e4abe7ced5999dbf5334b2;hpb=2276aa6c098a0337bc2bec49742e332bdd1b802c;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 55b0c726..a784e0f2 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=