Merge branch 'pe/doc-email-env-is-trumped-by-config' into maint

diff --git a/t/t3303-notes-subtrees.sh b/t/t3303-notes-subtrees.sh
index d571708ff27e3a64f93eacffb259fa3722e4ee79..704aee81ef5618048bba5209629a0dfde136fdb3 100755 (executable)
--- a/t/t3303-notes-subtrees.sh
+++ b/t/t3303-notes-subtrees.sh
@@ -173,6 +173,7 @@ verify_concatenated_notes () {
        while [ $i -gt 0 ]; do
                echo "    commit #$i" &&
                echo "    first note for commit #$i" &&
+               echo "    " &&
                echo "    second note for commit #$i" &&
                i=$(($i-1));
        done > expect &&