git log: don't do merge diffs by default

diff --git a/git-format-patch.sh b/git-format-patch.sh
index 2ebf7e8596eaf9253cf302a01d9f9fb8c08041cf..c7133bc12624a7d00ea8c36b8f55207c16127bf4 100755 (executable)
--- a/git-format-patch.sh
+++ b/git-format-patch.sh
@@ -126,8 +126,8 @@ for revpair
 do
        case "$revpair" in
        ?*..?*)
-               rev1=`expr "$revpair" : '\(.*\)\.\.'`
-               rev2=`expr "$revpair" : '.*\.\.\(.*\)'`
+               rev1=`expr "z$revpair" : 'z\(.*\)\.\.'`
+               rev2=`expr "z$revpair" : 'z.*\.\.\(.*\)'`
                ;;
        *)
                rev1="$revpair^"