fetching https://github.com/ibuclaw/dmd.git mvresolve (attempt: 1/3)
From https://github.com/ibuclaw/dmd
 * branch            mvresolve  -> 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 4528 and retry the command.
CONFLICT (modify/delete): src/dmd/typesem.d deleted in HEAD and modified in a6aaafa425962b9b6ea5215ceb5c89461924bf3e. Version a6aaafa425962b9b6ea5215ceb5c89461924bf3e of src/dmd/typesem.d left in tree.
CONFLICT (modify/delete): src/dmd/traits.d deleted in HEAD and modified in a6aaafa425962b9b6ea5215ceb5c89461924bf3e. Version a6aaafa425962b9b6ea5215ceb5c89461924bf3e of src/dmd/traits.d left in tree.
CONFLICT (modify/delete): src/dmd/templateparamsem.d deleted in HEAD and modified in a6aaafa425962b9b6ea5215ceb5c89461924bf3e. Version a6aaafa425962b9b6ea5215ceb5c89461924bf3e of src/dmd/templateparamsem.d left in tree.
CONFLICT (modify/delete): src/dmd/mtype.d deleted in HEAD and modified in a6aaafa425962b9b6ea5215ceb5c89461924bf3e. Version a6aaafa425962b9b6ea5215ceb5c89461924bf3e of src/dmd/mtype.d left in tree.
CONFLICT (modify/delete): src/dmd/expressionsem.d deleted in HEAD and modified in a6aaafa425962b9b6ea5215ceb5c89461924bf3e. Version a6aaafa425962b9b6ea5215ceb5c89461924bf3e of src/dmd/expressionsem.d left in tree.
CONFLICT (modify/delete): src/dmd/dtemplate.d deleted in HEAD and modified in a6aaafa425962b9b6ea5215ceb5c89461924bf3e. Version a6aaafa425962b9b6ea5215ceb5c89461924bf3e of src/dmd/dtemplate.d left in tree.
CONFLICT (modify/delete): src/dmd/dsymbolsem.d deleted in HEAD and modified in a6aaafa425962b9b6ea5215ceb5c89461924bf3e. Version a6aaafa425962b9b6ea5215ceb5c89461924bf3e of src/dmd/dsymbolsem.d left in tree.
CONFLICT (modify/delete): src/build.d deleted in HEAD and modified in a6aaafa425962b9b6ea5215ceb5c89461924bf3e. Version a6aaafa425962b9b6ea5215ceb5c89461924bf3e of src/build.d left in tree.
Auto-merging compiler/test/fail_compilation/fail6451.d
Auto-merging compiler/test/fail_compilation/fail18372.d
Automatic merge failed; fix conflicts and then commit the result.