fetching https://github.com/LemonBoy/dmd.git ternary-codegen (attempt: 1/3)
From https://github.com/LemonBoy/dmd
 * branch                  ternary-codegen -> FETCH_HEAD

merging FETCH_HEAD
CONFLICT (modify/delete): src/dmd/optimize.d deleted in HEAD and modified in 51210e3eaf9b81e9ecc1ad76d0a64faeb0fa3ef4. Version 51210e3eaf9b81e9ecc1ad76d0a64faeb0fa3ef4 of src/dmd/optimize.d left in tree.
CONFLICT (modify/delete): src/dmd/backend/cod2.c deleted in HEAD and modified in 51210e3eaf9b81e9ecc1ad76d0a64faeb0fa3ef4. Version 51210e3eaf9b81e9ecc1ad76d0a64faeb0fa3ef4 of src/dmd/backend/cod2.c left in tree.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 3704 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.