2 Commits (9ca8f6079cdb199851636c719900472a9745885f)

Author SHA1 Message Date
Johannes Schindelin 249c61a62d merge-recursive: respect core.autocrlf when writing out the result 17 years ago
Marius Storm-Olsen eea982843e Add testcase for merging in a CRLF repo 17 years ago