i18n: rebase-interactive: mark here-doc strings for translation

diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh
index fde5e712eb512791c893de7b393fe36e382a3f6d..2a0fbb87b1d63f1a07f8a3934e1546c695a73f56 100755 (executable)
--- a/t/t6012-rev-list-simplify.sh
+++ b/t/t6012-rev-list-simplify.sh
@@ -71,7 +71,7 @@ test_expect_success setup '
        note J &&
 
        git checkout master &&
-       test_tick && git merge -m "Coolest" unrelated &&
+       test_tick && git merge --allow-unrelated-histories -m "Coolest" unrelated &&
        note K &&
 
        echo "Immaterial" >elif &&
@@ -95,10 +95,7 @@ check_outcome () {
                git log --pretty="$FMT" --parents $param |
                unnote >actual &&
                sed -e "s/^.*   \([^ ]*\) .*/\1/" >check <actual &&
-               test_cmp expect check || {
-                       cat actual
-                       false
-               }
+               test_cmp expect check
        '
 }
 
@@ -121,10 +118,7 @@ test_expect_success 'full history simplification without parent' '
        git log --pretty="$FMT" --full-history E -- lost |
        unnote >actual &&
        sed -e "s/^.*   \([^ ]*\) .*/\1/" >check <actual &&
-       test_cmp expect check || {
-               cat actual
-               false
-       }
+       test_cmp expect check
 '
 
 test_expect_success '--full-diff is not affected by --parents' '