fetching https://github.com/kinke/dmd.git __equals (attempt: 1/3)
From https://github.com/kinke/dmd
 * branch            __equals   -> 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 4242 and retry the command.
CONFLICT (modify/delete): test/runnable/sdtor.d deleted in HEAD and modified in 438c73aa182c1aa89b93200149dff68f74eac4ad. Version 438c73aa182c1aa89b93200149dff68f74eac4ad of test/runnable/sdtor.d left in tree.
CONFLICT (modify/delete): src/dmd/inline.d deleted in HEAD and modified in 438c73aa182c1aa89b93200149dff68f74eac4ad. Version 438c73aa182c1aa89b93200149dff68f74eac4ad of src/dmd/inline.d left in tree.
CONFLICT (modify/delete): src/dmd/expressionsem.d deleted in HEAD and modified in 438c73aa182c1aa89b93200149dff68f74eac4ad. Version 438c73aa182c1aa89b93200149dff68f74eac4ad of src/dmd/expressionsem.d left in tree.
CONFLICT (modify/delete): src/dmd/e2ir.d deleted in HEAD and modified in 438c73aa182c1aa89b93200149dff68f74eac4ad. Version 438c73aa182c1aa89b93200149dff68f74eac4ad of src/dmd/e2ir.d left in tree.
CONFLICT (modify/delete): src/dmd/backend/rtlsym.d deleted in HEAD and modified in 438c73aa182c1aa89b93200149dff68f74eac4ad. Version 438c73aa182c1aa89b93200149dff68f74eac4ad of src/dmd/backend/rtlsym.d left in tree.
CONFLICT (modify/delete): src/dmd/backend/drtlsym.d deleted in HEAD and modified in 438c73aa182c1aa89b93200149dff68f74eac4ad. Version 438c73aa182c1aa89b93200149dff68f74eac4ad of src/dmd/backend/drtlsym.d left in tree.
Auto-merging compiler/test/fail_compilation/verifyhookexist.d
Auto-merging compiler/test/fail_compilation/diag7420.d
Automatic merge failed; fix conflicts and then commit the result.