fetching https://github.com/thewilsonator/dmd.git delegate-constext-quals (attempt: 1/3)
From https://github.com/thewilsonator/dmd
 * branch                  delegate-constext-quals -> FETCH_HEAD

merging FETCH_HEAD
CONFLICT (modify/delete): src/dmd/expression.d deleted in HEAD and modified in cb269509483caa916fd3bd568401ed58aae6ead8. Version cb269509483caa916fd3bd568401ed58aae6ead8 of src/dmd/expression.d left in tree.
CONFLICT (file location): test/fail_compilation/test19961.d added in cb269509483caa916fd3bd568401ed58aae6ead8 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/test19961.d.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 2969 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.