fetching https://github.com/BorisCarvajal/dmd.git fix_frontend_examples (attempt: 1/3)
From https://github.com/BorisCarvajal/dmd
 * branch            fix_frontend_examples -> 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 4436 and retry the command.
CONFLICT (modify/delete): test/dub_package/retrieveScope.d deleted in HEAD and modified in 42e654bed18348d2a0361733977fc12503dcf095. Version 42e654bed18348d2a0361733977fc12503dcf095 of test/dub_package/retrieveScope.d left in tree.
CONFLICT (modify/delete): src/dmd/lexer.d deleted in HEAD and modified in 42e654bed18348d2a0361733977fc12503dcf095. Version 42e654bed18348d2a0361733977fc12503dcf095 of src/dmd/lexer.d left in tree.
CONFLICT (modify/delete): src/dmd/frontend.d deleted in HEAD and modified in 42e654bed18348d2a0361733977fc12503dcf095. Version 42e654bed18348d2a0361733977fc12503dcf095 of src/dmd/frontend.d left in tree.
Auto-merging compiler/test/dub_package/lexer.d
Auto-merging compiler/test/dub_package/impvisitor.d
Auto-merging compiler/test/dub_package/avg.d
Automatic merge failed; fix conflicts and then commit the result.