X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3507-cherry-pick-conflict.sh;h=e25cf8039a310e325c23e85ce5fc845a0f681200;hb=de8c359786ac9ea825eca59403ef15c961e8caae;hp=6a208173779f744f6b350ee12dd710be157ace6e;hpb=d68565402a69fac3fe0e0653718feca7c80c178b;p=git.git

diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
old mode 100644
new mode 100755
index 6a2081737..e25cf8039
--- 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