log_ref_setup: don't return stack-allocated array

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

diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
old mode 100644 (file)
new mode 100755 (executable)
index e856356..e25cf80
--- 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 &&