fetching https://github.com/maxhaton/dmd.git tookAddressRefactor (attempt: 1/3) From https://github.com/maxhaton/dmd * branch tookAddressRefactor -> 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 4542 and retry the command. CONFLICT (modify/delete): src/dmd/statementsem.d deleted in HEAD and modified in 18604f2c3cb659270565f1c51a3390afd09c7c76. Version 18604f2c3cb659270565f1c51a3390afd09c7c76 of src/dmd/statementsem.d left in tree. CONFLICT (modify/delete): src/dmd/func.d deleted in HEAD and modified in 18604f2c3cb659270565f1c51a3390afd09c7c76. Version 18604f2c3cb659270565f1c51a3390afd09c7c76 of src/dmd/func.d left in tree. CONFLICT (modify/delete): src/dmd/expressionsem.d deleted in HEAD and modified in 18604f2c3cb659270565f1c51a3390afd09c7c76. Version 18604f2c3cb659270565f1c51a3390afd09c7c76 of src/dmd/expressionsem.d left in tree. CONFLICT (modify/delete): src/dmd/escape.d deleted in HEAD and modified in 18604f2c3cb659270565f1c51a3390afd09c7c76. Version 18604f2c3cb659270565f1c51a3390afd09c7c76 of src/dmd/escape.d left in tree. CONFLICT (modify/delete): src/dmd/dsymbolsem.d deleted in HEAD and modified in 18604f2c3cb659270565f1c51a3390afd09c7c76. Version 18604f2c3cb659270565f1c51a3390afd09c7c76 of src/dmd/dsymbolsem.d left in tree. CONFLICT (modify/delete): src/dmd/dcast.d deleted in HEAD and modified in 18604f2c3cb659270565f1c51a3390afd09c7c76. Version 18604f2c3cb659270565f1c51a3390afd09c7c76 of src/dmd/dcast.d left in tree. Automatic merge failed; fix conflicts and then commit the result.