fetching https://github.com/jacob-carlborg/dmd.git crlf-to-lexer-test (attempt: 1/3) From https://github.com/jacob-carlborg/dmd * branch crlf-to-lexer-test -> FETCH_HEAD merging FETCH_HEAD warning: inexact rename detection was skipped due to too many files. warning: you may want to set your merge.renamelimit variable to at least 3855 and retry the command. CONFLICT (modify/delete): src/dmd/tokens.d deleted in HEAD and modified in a4cd92e277735fa2249f5c7e4b1fa6eac3327a7a. Version a4cd92e277735fa2249f5c7e4b1fa6eac3327a7a of src/dmd/tokens.d left in tree. CONFLICT (modify/delete): src/dmd/lexer.d deleted in HEAD and modified in a4cd92e277735fa2249f5c7e4b1fa6eac3327a7a. Version a4cd92e277735fa2249f5c7e4b1fa6eac3327a7a of src/dmd/lexer.d left in tree. Automatic merge failed; fix conflicts and then commit the result.