Merge branch 'jl/submodule-add-noname'

diff --git a/t/t4019-diff-wserror.sh b/t/t4019-diff-wserror.sh
index 1e75f1a1108f1d82e65511c9cfc19fee70866205..3a3663fbcb4795a9e3755fe831c89a7e312f659e 100755 (executable)
--- a/t/t4019-diff-wserror.sh
+++ b/t/t4019-diff-wserror.sh
@@ -193,7 +193,7 @@ test_expect_success 'do not color trailing cr in context' '
 test_expect_success 'color new trailing blank lines' '
        { echo a; echo b; echo; echo; } >x &&
        git add x &&
-       { echo a; echo; echo; echo; echo; } >x &&
+       { echo a; echo; echo; echo; echo c; echo; echo; echo; echo; } >x &&
        git diff --color x >output &&
        cnt=$(grep "${blue_grep}" output | wc -l) &&
        test $cnt = 2