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
Auto-merging compiler/test/dub_package/retrieveScope.d
CONFLICT (content): Merge conflict in compiler/test/dub_package/retrieveScope.d
Auto-merging compiler/src/dmd/lexer.d
Auto-merging compiler/src/dmd/frontend.d
CONFLICT (content): Merge conflict in compiler/src/dmd/frontend.d
Automatic merge failed; fix conflicts and then commit the result.