Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t3400 (rebase): whitespace cleanup
[gitweb.git]
/
t
/
t6033-merge-crlf.sh
diff --git
a/t/t6033-merge-crlf.sh
b/t/t6033-merge-crlf.sh
index 75d9602de4d4238b4182956127540525f711d33f..e8d65eefb521cc9f2e8211918734d069381772d4 100755
(executable)
--- 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