fetching https://github.com/WebFreak001/dmd.git custom-condition-errors (attempt: 1/3)
From https://github.com/WebFreak001/dmd
 * branch            custom-condition-errors -> 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 4295 and retry the command.
CONFLICT (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in 745c3814ac99842f9e9de40db193aaa04118a91b. Version 745c3814ac99842f9e9de40db193aaa04118a91b of src/dmd/frontend.h left in tree.
CONFLICT (modify/delete): src/dmd/expressionsem.d deleted in HEAD and modified in 745c3814ac99842f9e9de40db193aaa04118a91b. Version 745c3814ac99842f9e9de40db193aaa04118a91b of src/dmd/expressionsem.d left in tree.
CONFLICT (modify/delete): src/dmd/dtemplate.d deleted in HEAD and modified in 745c3814ac99842f9e9de40db193aaa04118a91b. Version 745c3814ac99842f9e9de40db193aaa04118a91b of src/dmd/dtemplate.d left in tree.
Auto-merging compiler/src/dmd/staticcond.d
Automatic merge failed; fix conflicts and then commit the result.