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