fetching https://github.com/BorisCarvajal/dmd.git fix17954_deprecation (attempt: 1/3)
From https://github.com/BorisCarvajal/dmd
 * branch            fix17954_deprecation -> 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 4483 and retry the command.
CONFLICT (modify/delete): src/dmd/dsymbol.d deleted in HEAD and modified in 5ef45316549c658e739b40f10b5b5071743de286. Version 5ef45316549c658e739b40f10b5b5071743de286 of src/dmd/dsymbol.d left in tree.
Auto-merging compiler/test/runnable/test22.d
Auto-merging compiler/test/runnable/test20.d
Auto-merging compiler/test/runnable/template1.d
Auto-merging compiler/test/runnable/nested.d
Auto-merging compiler/test/compilable/test15762.d
Automatic merge failed; fix conflicts and then commit the result.