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
CONFLICT (file location): test/fail_compilation/custom_constraint_errors.d added in 745c3814ac99842f9e9de40db193aaa04118a91b inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/custom_constraint_errors.d.
Auto-merging compiler/src/dmd/frontend.h
CONFLICT (content): Merge conflict in compiler/src/dmd/frontend.h
Auto-merging compiler/src/dmd/expressionsem.d
Auto-merging compiler/src/dmd/dtemplate.d
Automatic merge failed; fix conflicts and then commit the result.