1. 249c61a merge-recursive: respect core.autocrlf when writing out the result by Johannes Schindelin · 17 years ago
  2. eea9828 Add testcase for merging in a CRLF repo by Marius Storm-Olsen · 17 years ago