fetching https://github.com/jacob-carlborg/dmd.git 18716-dslice-cpp (attempt: 1/3)
From https://github.com/jacob-carlborg/dmd
 * branch            18716-dslice-cpp -> 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 3690 and retry the command.
CONFLICT (modify/delete): test/compilable/cppmangle.d deleted in HEAD and modified in 3f6e08a8e25b51b09df1e7ac28f7d356c629feff. Version 3f6e08a8e25b51b09df1e7ac28f7d356c629feff of test/compilable/cppmangle.d left in tree.
CONFLICT (modify/delete): src/dmd/root/array.h deleted in HEAD and modified in 3f6e08a8e25b51b09df1e7ac28f7d356c629feff. Version 3f6e08a8e25b51b09df1e7ac28f7d356c629feff of src/dmd/root/array.h left in tree.
CONFLICT (modify/delete): src/dmd/root/array.d deleted in HEAD and modified in 3f6e08a8e25b51b09df1e7ac28f7d356c629feff. Version 3f6e08a8e25b51b09df1e7ac28f7d356c629feff of src/dmd/root/array.d left in tree.
CONFLICT (modify/delete): src/dmd/mtype.h deleted in HEAD and modified in 3f6e08a8e25b51b09df1e7ac28f7d356c629feff. Version 3f6e08a8e25b51b09df1e7ac28f7d356c629feff of src/dmd/mtype.h left in tree.
CONFLICT (modify/delete): src/dmd/mtype.d deleted in HEAD and modified in 3f6e08a8e25b51b09df1e7ac28f7d356c629feff. Version 3f6e08a8e25b51b09df1e7ac28f7d356c629feff of src/dmd/mtype.d left in tree.
CONFLICT (modify/delete): src/dmd/id.d deleted in HEAD and modified in 3f6e08a8e25b51b09df1e7ac28f7d356c629feff. Version 3f6e08a8e25b51b09df1e7ac28f7d356c629feff of src/dmd/id.d left in tree.
CONFLICT (modify/delete): src/dmd/dmangle.d deleted in HEAD and modified in 3f6e08a8e25b51b09df1e7ac28f7d356c629feff. Version 3f6e08a8e25b51b09df1e7ac28f7d356c629feff of src/dmd/dmangle.d left in tree.
CONFLICT (modify/delete): src/dmd/cppmanglewin.d deleted in HEAD and modified in 3f6e08a8e25b51b09df1e7ac28f7d356c629feff. Version 3f6e08a8e25b51b09df1e7ac28f7d356c629feff of src/dmd/cppmanglewin.d left in tree.
CONFLICT (modify/delete): src/dmd/cppmangle.d deleted in HEAD and modified in 3f6e08a8e25b51b09df1e7ac28f7d356c629feff. Version 3f6e08a8e25b51b09df1e7ac28f7d356c629feff of src/dmd/cppmangle.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.