summaryrefslogtreecommitdiff
path: root/t/t6033-merge-crlf.sh
Commit message (Expand)AuthorAgeFilesLines
* tests: consolidate CR removal/addition functionsStephen Boyd2010-01-251-8/+0
* merge-recursive: respect core.autocrlf when writing out the resultJohannes Schindelin2008-06-091-1/+1
* Add testcase for merging in a CRLF repoMarius Storm-Olsen2008-06-091-0/+52