Merge branch 'jl/maint-submodule-gitfile-awareness'

diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index e8563560cbb861a38523772ffcf71103deaba64e..e25cf8039a310e325c23e85ce5fc845a0f681200 100644 (file)
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -112,7 +112,7 @@ test_expect_success 'diff3 -m style' '
        cat <<-EOF > expected &&
        <<<<<<< HEAD
        a
-       |||||||
+       ||||||| parent of objid picked
        b
        =======
        c
@@ -138,7 +138,7 @@ test_expect_success 'revert also handles conflicts sanely' '
        a
        =======
        b
-       >>>>>>> objid picked
+       >>>>>>> parent of objid picked
        EOF
        {
                git checkout picked -- foo &&
@@ -179,11 +179,11 @@ test_expect_success 'revert conflict, diff3 -m style' '
        cat <<-EOF > expected &&
        <<<<<<< HEAD
        a
-       |||||||
+       ||||||| objid picked
        c
        =======
        b
-       >>>>>>> objid picked
+       >>>>>>> parent of objid picked
        EOF
 
        git update-index --refresh &&