Merge branch 'jk/maint-sha1-file-name-fix' into maint

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 6a20817..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
@@ -179,7 +179,7 @@ test_expect_success 'revert conflict, diff3 -m style' '
        cat <<-EOF > expected &&
        <<<<<<< HEAD
        a
-       |||||||
+       ||||||| objid picked
        c
        =======
        b