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/test15862.d deleted in HEAD and modified in 8d22a9f6d79e3f38becadcef5c9440db0eaaf791. Version 8d22a9f6d79e3f38becadcef5c9440db0eaaf791 of test/runnable/test15862.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/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/extra-files/cpp_abi_tests.cpp CONFLICT (content): Merge conflict in compiler/test/runnable_cxx/extra-files/cpp_abi_tests.cpp Auto-merging compiler/test/runnable_cxx/cpp_abi_tests.d CONFLICT (content): Merge conflict in compiler/test/runnable_cxx/cpp_abi_tests.d Auto-merging compiler/test/runnable/testabi.d Auto-merging compiler/src/dmd/backend/ty.d CONFLICT (content): Merge conflict in compiler/src/dmd/backend/ty.d Auto-merging compiler/src/dmd/backend/dtype.d Auto-merging compiler/src/dmd/backend/code.d CONFLICT (content): Merge conflict in compiler/src/dmd/backend/code.d Auto-merging compiler/src/dmd/backend/cod3.d CONFLICT (content): Merge conflict in compiler/src/dmd/backend/cod3.d Auto-merging compiler/src/dmd/backend/cod1.d CONFLICT (content): Merge conflict in compiler/src/dmd/backend/cod1.d Auto-merging compiler/src/dmd/backend/cgelem.d CONFLICT (content): Merge conflict in compiler/src/dmd/backend/cgelem.d Auto-merging compiler/src/dmd/backend/cg87.d Auto-merging compiler/src/dmd/backend/cc.d Auto-merging compiler/src/dmd/argtypes_sysv_x64.d CONFLICT (content): Merge conflict in compiler/src/dmd/argtypes_sysv_x64.d warning: inexact rename detection was skipped due to too many files. warning: you may want to set your merge.renamelimit variable to at least 2890 and retry the command. Automatic merge failed; fix conflicts and then commit the result.