Merge branch 'master' into next

diff --git a/t/t4101-apply-nonl.sh b/t/t4101-apply-nonl.sh
index 380ef15a271bfac2fd33124901757e100511d40a..26b131d0d5567a05e4ce7f386a06147e7b64fd88 100755 (executable)
--- a/t/t4101-apply-nonl.sh
+++ b/t/t4101-apply-nonl.sh
@@ -30,3 +30,5 @@ do
        "git-apply <diff.$i-$j && diff frotz.$j frotz"
   done
 done
+
+test_done