cherry-pick, revert: add a label for ancestor

[thirdparty/git.git] / t / t3507-cherry-pick-conflict.sh

diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index 6a208173779f744f6b350ee12dd710be157ace6e..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
@@ -179,7 +179,7 @@ test_expect_success 'revert conflict, diff3 -m style' '
        cat <<-EOF > expected &&
        <<<<<<< HEAD
        a
-       |||||||
+       ||||||| objid picked
        c
        =======
        b