merge-octopus: abort if index does not match HEAD

diff --git a/t/t9108-git-svn-glob.sh b/t/t9108-git-svn-glob.sh
index a526d603793957f781002c98b2da60e1005bf39f..a94286c8ec89823805989f4363072417e9c20165 100755 (executable)
--- a/t/t9108-git-svn-glob.sh
+++ b/t/t9108-git-svn-glob.sh
@@ -86,9 +86,12 @@ test_expect_success 'test left-hand-side only globbing' '
        test_cmp expect.two output.two
        '
 
-echo "Only one set of wildcard directories" \
-     "(e.g. '*' or '*/*/*') is supported: 'branches/*/t/*'" > expect.three
-echo "" >> expect.three
+test_expect_success 'prepare test disallow multi-globs' "
+cat >expect.three <<EOF
+Only one set of wildcards (e.g. '*' or '*/*/*') is supported: branches/*/t/*
+
+EOF
+       "
 
 test_expect_success 'test disallow multi-globs' '
        git config --add svn-remote.three.url "$svnrepo" &&