fetching https://github.com/ibuclaw/dmd.git issue15298 (attempt: 1/3)
From https://github.com/ibuclaw/dmd
 * branch            issue15298 -> 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 4134 and retry the command.
CONFLICT (modify/delete): src/dmd/dtemplate.d deleted in HEAD and modified in 540a71b8d55990a105beeb05d4ff0f849fba020b. Version 540a71b8d55990a105beeb05d4ff0f849fba020b of src/dmd/dtemplate.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.