Merge branch 'gp/maint-cvsserver'

diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index f64aa48d24f2f5704d07b9285c94ba983f7d92ac..bc46563afc607e6fba9acbd2773d88207c878981 100755 (executable)
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -77,10 +77,6 @@ test_expect_success 'apply binary patch' \
         tree1=`git write-tree` &&
         test "$tree1" = "$tree0"'
 
-q_to_nul() {
-       perl -pe 'y/Q/\000/'
-}
-
 nul_to_q() {
        perl -pe 'y/\000/Q/'
 }