Merge branch 'en/abort-df-conflict-fixes'

diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh
index 596907758d5d47ae8026098a2ce4acd8c01df6aa..4d62ceef9c15cc981bada757bcf7cfa43f2dd9a5 100755 (executable)
--- a/t/t1411-reflog-show.sh
+++ b/t/t1411-reflog-show.sh
@@ -159,9 +159,9 @@ test_expect_success 'git log -g -p shows diffs vs. parents' '
        git log -1 -p HEAD^ >log.one &&
        git log -1 -p HEAD >log.two &&
        (
-               cat log.one; echo
-               cat log.two; echo
-               cat log.one; echo
+               cat log.one && echo &&
+               cat log.two && echo &&
+               cat log.one && echo &&
                cat log.two
        ) >expect &&
        test_cmp expect actual