Allow GIT_DIR to be an absolute path

[git.git] / git-merge.sh

diff --git a/git-merge.sh b/git-merge.sh
index dd104db..b810fce 100755 (executable)
--- 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=