fetching https://github.com/Luhrel/dmd.git fix21158 (attempt: 1/3)
From https://github.com/Luhrel/dmd
 * branch            fix21158   -> 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 3933 and retry the command.
CONFLICT (modify/delete): src/dmd/backend/dwarfdbginf.d deleted in HEAD and modified in 247bf7272794170f543de08052729577524012d1. Version 247bf7272794170f543de08052729577524012d1 of src/dmd/backend/dwarfdbginf.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.