Add testcase for merging in a CRLF repo