[PATCH] Fix buffer overflow in ce_flush().

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