Commit 2a8841ae8750b52645eb85dd56305798a429a26d
2018-01-21T12:28:13
merge: test CR/LF conflicts for CR/LF files Ensure that when the files being merged have CR/LF line endings that the conflict markers produced in the conflict file also have CR/LF line endings.