diff options
Diffstat (limited to 't/t6033-merge-crlf.sh')
| -rwxr-xr-x | t/t6033-merge-crlf.sh | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/t/t6033-merge-crlf.sh b/t/t6033-merge-crlf.sh index 75d9602..e8d65ee 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 |