Merge branch 'rc/maint-curl-helper' into maint

[git.git] / t / t7201-co.sh

diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 01175f74d2df7b2d4732b63cd1b7df477917ea7e..1337fa5a2209d489c43f0a34c95a89053d3fd8bf 100755 (executable)
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -209,7 +209,7 @@ test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
        a
        c
        e
-       |||||||
+       ||||||| master
        a
        b
        c
@@ -538,7 +538,7 @@ test_expect_success 'checkout with --merge, in diff3 -m style' '
        (
                echo "<<<<<<< ours"
                echo ourside
-               echo "|||||||"
+               echo "||||||| base"
                echo original
                echo "======="
                echo theirside
@@ -582,7 +582,7 @@ test_expect_success 'checkout --conflict=diff3' '
        (
                echo "<<<<<<< ours"
                echo ourside
-               echo "|||||||"
+               echo "||||||| base"
                echo original
                echo "======="
                echo theirside