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

merging FETCH_HEAD
CONFLICT (modify/delete): test/runnable/testargtypes.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of test/runnable/testargtypes.d left in tree.
CONFLICT (modify/delete): test/runnable/testabi.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of test/runnable/testabi.d left in tree.
CONFLICT (modify/delete): test/runnable/test15862.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of test/runnable/test15862.d left in tree.
CONFLICT (modify/delete): test/runnable/extra-files/cpp_abi_tests.cpp deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of test/runnable/extra-files/cpp_abi_tests.cpp left in tree.
CONFLICT (modify/delete): test/runnable/cpp_abi_tests.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of test/runnable/cpp_abi_tests.d left in tree.
CONFLICT (modify/delete): src/dmd/toir.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of src/dmd/toir.d left in tree.
CONFLICT (modify/delete): src/dmd/toctype.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of src/dmd/toctype.d left in tree.
CONFLICT (modify/delete): src/dmd/tocsym.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of src/dmd/tocsym.d left in tree.
CONFLICT (modify/delete): src/dmd/target.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of src/dmd/target.d left in tree.
CONFLICT (modify/delete): src/dmd/glue.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of src/dmd/glue.d left in tree.
CONFLICT (modify/delete): src/dmd/e2ir.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of src/dmd/e2ir.d left in tree.
CONFLICT (modify/delete): src/dmd/dstruct.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of src/dmd/dstruct.d left in tree.
CONFLICT (modify/delete): src/dmd/backend/type.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of src/dmd/backend/type.d left in tree.
CONFLICT (modify/delete): src/dmd/backend/ty.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of src/dmd/backend/ty.d left in tree.
CONFLICT (modify/delete): src/dmd/backend/dtype.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of src/dmd/backend/dtype.d left in tree.
CONFLICT (modify/delete): src/dmd/backend/code.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of src/dmd/backend/code.d left in tree.
CONFLICT (modify/delete): src/dmd/backend/cod3.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of src/dmd/backend/cod3.d left in tree.
CONFLICT (modify/delete): src/dmd/backend/cod1.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of src/dmd/backend/cod1.d left in tree.
CONFLICT (modify/delete): src/dmd/backend/cgelem.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of src/dmd/backend/cgelem.d left in tree.
CONFLICT (modify/delete): src/dmd/backend/cg87.d deleted in HEAD and modified in 8warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 3789 and retry the command.
d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of src/dmd/backend/cg87.d left in tree.
CONFLICT (modify/delete): src/dmd/backend/cc.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of src/dmd/backend/cc.d left in tree.
CONFLICT (modify/delete): src/dmd/argtypes_sysv_x64.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of src/dmd/argtypes_sysv_x64.d left in tree.
CONFLICT (modify/delete): src/dmd/aggregate.h deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of src/dmd/aggregate.h left in tree.
Auto-merging compiler/test/runnable_cxx/cabi1.d
Automatic merge failed; fix conflicts and then commit the result.