2 Commits (986e82396ab23b9e5f4eab7183bbf76e7bc756d0)

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