ll-merge: use a longer conflict marker for internal merge

diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 6a3cdd1ac6ddc5c2f9f16b1a598503170d56a993..6805b9e6bb5b7e6a6b6b9546e96023ebeb557bd0 100755 (executable)
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -655,7 +655,7 @@ test_expect_success 'stdin verify fails for mistaken null value' '
        test_cmp expect actual
 '
 
-test_expect_failure 'stdin verify fails for mistaken empty value' '
+test_expect_success 'stdin verify fails for mistaken empty value' '
        M=$(git rev-parse $m) &&
        test_when_finished "git update-ref $m $M" &&
        git rev-parse $m >expect &&
@@ -1020,7 +1020,7 @@ test_expect_success 'stdin -z verify fails for mistaken null value' '
        test_cmp expect actual
 '
 
-test_expect_failure 'stdin -z verify fails for mistaken empty value' '
+test_expect_success 'stdin -z verify fails for mistaken empty value' '
        M=$(git rev-parse $m) &&
        test_when_finished "git update-ref $m $M" &&
        git rev-parse $m >expect &&