Merge branch 'ja/maint-pull-rebase-doc' into maint

diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index f3f0c4cfdc9298188834444b0b3391fbc5e549a1..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