combine-diff: coalesce lost lines optimally

diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh
index efcd8abd2f97458cfe06900d1723910bc59ac6dc..5c0053a20bf2fbf1dd466ace5dc933e38ce3544d 100755 (executable)
--- a/t/t1011-read-tree-sparse-checkout.sh
+++ b/t/t1011-read-tree-sparse-checkout.sh
@@ -245,6 +245,7 @@ error: The following untracked working tree files would be overwritten by checko
        sub/added
        sub/addedtoo
 Please move or remove them before you can switch branches.
+Aborting
 EOF
        test_cmp expected actual
 '