summaryrefslogtreecommitdiff
path: root/t/t6033-merge-crlf.sh
AgeCommit message (Expand)Author
2010-01-26tests: consolidate CR removal/addition functionsStephen Boyd
2008-06-09merge-recursive: respect core.autocrlf when writing out the resultJohannes Schindelin
2008-06-09Add testcase for merging in a CRLF repoMarius Storm-Olsen