X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft6033-merge-crlf.sh;h=e8d65eefb521cc9f2e8211918734d069381772d4;hb=6cd52edbbd9acc7797cffeba1b849538285ed558;hp=75d9602de4d4238b4182956127540525f711d33f;hpb=00d3278c8534a8244ae3447189401111e017fd5d;p=git.git

diff --git a/t/t6033-merge-crlf.sh b/t/t6033-merge-crlf.sh
index 75d9602de..e8d65eefb 100755
--- a/t/t6033-merge-crlf.sh
+++ b/t/t6033-merge-crlf.sh
@@ -1,13 +1,5 @@
 #!/bin/sh
 
-append_cr () {
-	sed -e 's/$/Q/' | tr Q '\015'
-}
-
-remove_cr () {
-	tr '\015' Q | sed -e 's/Q$//'
-}
-
 test_description='merge conflict in crlf repo
 
 		b---M