fetching https://github.com/rainers/dmd.git dataptr_elf (attempt: 1/3)
From https://github.com/rainers/dmd
 * branch            dataptr_elf -> 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 4751 and retry the command.
CONFLICT (modify/delete): test/runnable/testptrref.d deleted in HEAD and modified in 373f86855373e1bf0ee6ce2ab298d1d811b28acf. Version 373f86855373e1bf0ee6ce2ab298d1d811b28acf of test/runnable/testptrref.d left in tree.
CONFLICT (modify/delete): src/dmd/backend/elfobj.c deleted in HEAD and modified in 373f86855373e1bf0ee6ce2ab298d1d811b28acf. Version 373f86855373e1bf0ee6ce2ab298d1d811b28acf of src/dmd/backend/elfobj.c left in tree.
Automatic merge failed; fix conflicts and then commit the result.