fetching https://github.com/maxhaton/dmd.git dmdFrontendTimeTrace (attempt: 1/3)
From https://github.com/maxhaton/dmd
 * branch            dmdFrontendTimeTrace -> 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 4542 and retry the command.
Auto-merging src/dmd/mars.d
CONFLICT (content): Merge conflict in src/dmd/mars.d
CONFLICT (modify/delete): src/dmd/globals.d deleted in HEAD and modified in ccad92588dc66516d2d4ce7d3e0c6ee911cc9590. Version ccad92588dc66516d2d4ce7d3e0c6ee911cc9590 of src/dmd/globals.d left in tree.
CONFLICT (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in ccad92588dc66516d2d4ce7d3e0c6ee911cc9590. Version ccad92588dc66516d2d4ce7d3e0c6ee911cc9590 of src/dmd/frontend.h left in tree.
CONFLICT (modify/delete): src/build.d deleted in HEAD and modified in ccad92588dc66516d2d4ce7d3e0c6ee911cc9590. Version ccad92588dc66516d2d4ce7d3e0c6ee911cc9590 of src/build.d left in tree.
Auto-merging compiler/src/dmd/root/rmem.d
Automatic merge failed; fix conflicts and then commit the result.