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