[PATCH] Escape asciidoc's built-in em-dash replacement

[git.git] / git-merge.sh

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