upload-pack.c: <sys/poll.h> includes <ctype.h> on OpenBSD 3.8

[git.git] / git-merge.sh

diff --git a/git-merge.sh b/git-merge.sh
index fc25f8dda01ecf4733165308d9fb1fa80dffbe0c..24e3b507ef1f907e7146a2653189f45a92db08fd 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -103,7 +103,7 @@ do
        -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
                case "$#,$1" in
                *,*=*)
-                       strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
+                       strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
                1,*)
                        usage ;;
                *)