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
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.
CONFLICT (file location): test/unit/lexer/line_endings.d added in a4cd92e277735fa2249f5c7e4b1fa6eac3327a7a inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/unit/lexer/line_endings.d.
CONFLICT (rename/delete): test/unit/compilable/crlf.d deleted in a4cd92e277735fa2249f5c7e4b1fa6eac3327a7a and renamed to compiler/test/unit/compilable/crlf.d in HEAD. Version HEAD of compiler/test/unit/compilable/crlf.d left in tree.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 2992 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.