fetching https://github.com/ibuclaw/dmd.git dmddriverparams (attempt: 1/3)
From https://github.com/ibuclaw/dmd
 * branch            dmddriverparams -> 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 4296 and retry the command.
Auto-merging src/dmd/mars.d
CONFLICT (content): Merge conflict in src/dmd/mars.d
CONFLICT (modify/delete): src/dmd/dmdparams.d deleted in HEAD and modified in 7fa4e63d75a1e08699bd264daf20aa89be3b2d76. Version 7fa4e63d75a1e08699bd264daf20aa89be3b2d76 of src/dmd/dmdparams.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.