Merge git://ozlabs.org/~paulus/gitk

diff --git a/t/t0022-crlf-rename.sh b/t/t0022-crlf-rename.sh
index f1e1d48869a25c6ab1d0b570eb4c0e28afc5fa05..7af3fbcc7b9e5e61e41205accaa6d81e85cae6cf 100755 (executable)
--- a/t/t0022-crlf-rename.sh
+++ b/t/t0022-crlf-rename.sh
@@ -12,7 +12,7 @@ test_expect_success setup '
        test_tick &&
        git commit -m Initial &&
 
-       sed -e "s/\$/\r/" "$TEST_DIRECTORY"/t0022-crlf-rename.sh >elpmas &&
+       append_cr <"$TEST_DIRECTORY"/t0022-crlf-rename.sh >elpmas &&
        git add elpmas &&
        rm -f sample &&