summaryrefslogtreecommitdiff
path: root/t/t6033-merge-crlf.sh
AgeCommit message (Expand)AuthorFilesLines
2010-01-25tests: consolidate CR removal/addition functionsLibravatar Stephen Boyd1-8/+0
2008-06-09merge-recursive: respect core.autocrlf when writing out the resultLibravatar Johannes Schindelin1-1/+1
2008-06-09Add testcase for merging in a CRLF repoLibravatar Marius Storm-Olsen1-0/+52