sequencer: avoid garbled merge machinery messages due to commit labels

[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 752bc43487196a4be33ff7df770384f331a68315..152ea11dc9278978acf78e425785949be74d3ae8 100755 (executable)
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -283,12 +283,12 @@ test_expect_success 'failed cherry-pick describes conflict in work tree' '
        a
        =======
        c
-       >>>>>>> objid picked
+       >>>>>>> objid (picked)
        EOF
 
        test_must_fail git cherry-pick picked &&
 
-       sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&
+       sed "s/[a-f0-9]* (/objid (/" foo >actual &&
        test_cmp expected actual
 '
 
@@ -298,16 +298,16 @@ test_expect_success 'diff3 -m style' '
        cat <<-EOF >expected &&
        <<<<<<< HEAD
        a
-       ||||||| parent of objid picked
+       ||||||| parent of objid (picked)
        b
        =======
        c
-       >>>>>>> objid picked
+       >>>>>>> objid (picked)
        EOF
 
        test_must_fail git cherry-pick picked &&
 
-       sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&
+       sed "s/[a-f0-9]* (/objid (/" foo >actual &&
        test_cmp expected actual
 '
 
@@ -319,7 +319,7 @@ test_expect_success 'revert also handles conflicts sanely' '
        a
        =======
        b
-       >>>>>>> parent of objid picked
+       >>>>>>> parent of objid (picked)
        EOF
        {
                git checkout picked -- foo &&
@@ -345,7 +345,7 @@ test_expect_success 'revert also handles conflicts sanely' '
        test_must_fail git update-index --refresh -q &&
        test_must_fail git diff-index --exit-code HEAD &&
        test_cmp expected-stages actual-stages &&
-       sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&
+       sed "s/[a-f0-9]* (/objid (/" foo >actual &&
        test_cmp expected actual
 '
 
@@ -429,16 +429,16 @@ test_expect_success 'revert conflict, diff3 -m style' '
        cat <<-EOF >expected &&
        <<<<<<< HEAD
        a
-       ||||||| objid picked
+       ||||||| objid (picked)
        c
        =======
        b
-       >>>>>>> parent of objid picked
+       >>>>>>> parent of objid (picked)
        EOF
 
        test_must_fail git revert picked &&
 
-       sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&
+       sed "s/[a-f0-9]* (/objid (/" foo >actual &&
        test_cmp expected actual
 '