X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=b810fceaf8787f6c450abc628d0a329fe298b13f;hb=26349b2e5ee2311cbb12db1cb92fa48fb0f26ef8;hp=dd104db7ad5991543b1156e142173e40b0ff05bc;hpb=123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index dd104db7..b810fcea 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -14,7 +14,7 @@ usage () {
 
 # all_strategies='resolve recursive stupid octopus'
 
-all_strategies='recursive octopus resolve stupid'
+all_strategies='recursive octopus resolve stupid ours'
 default_strategies='resolve octopus'
 use_strategies=