Merge branch 'jk/maint-rmdir-fix' into maint

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 4e6a44b623c456dc85f9daa6c4b5b1f0789c93c5..4314ad2d66d06b411e4bc0c9ee7b07553fc35ac2 100755 (executable)
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -134,10 +134,6 @@ test_expect_success 'rebase -q is quiet' '
      test ! -s output.out
 '
 
-q_to_cr () {
-       tr Q '\015'
-}
-
 test_expect_success 'Rebase a commit that sprinkles CRs in' '
        (
                echo "One"