fetching https://github.com/ljmf00/dmd.git implement-dip-1029 (attempt: 1/3)
From https://github.com/ljmf00/dmd
 * branch            implement-dip-1029 -> FETCH_HEAD

merging FETCH_HEAD
CONFLICT (modify/delete): src/tests/cxxfrontend.c deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/tests/cxxfrontend.c left in tree.
CONFLICT (modify/delete): src/dmd/typesem.d deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/typesem.d left in tree.
CONFLICT (modify/delete): src/dmd/traits.d deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/traits.d left in tree.
CONFLICT (modify/delete): src/dmd/todt.d deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/todt.d left in tree.
CONFLICT (modify/delete): src/dmd/sideeffect.d deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/sideeffect.d left in tree.
CONFLICT (modify/delete): src/dmd/semantic3.d deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/semantic3.d left in tree.
CONFLICT (modify/delete): src/dmd/parse.d deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/parse.d left in tree.
CONFLICT (modify/delete): src/dmd/mtype.h deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/mtype.h left in tree.
CONFLICT (modify/delete): src/dmd/mtype.d deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/mtype.d left in tree.
CONFLICT (modify/delete): src/dmd/hdrgen.d deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/hdrgen.d left in tree.
CONFLICT (modify/delete): src/dmd/glue.d deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/glue.d left in tree.
CONFLICT (modify/delete): src/dmd/func.d deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/func.d left in tree.
CONFLICT (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/frontend.h left in tree.
CONFLICT (modify/delete): src/dmd/expression.d deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/expression.d left in tree.
CONFLICT (modify/delete): src/dmd/dsymbolsem.d deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/dsymbolsem.d left in tree.
CONFLICT (modify/delete): src/dmd/dmangle.d deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/dmangle.d left in tree.
CONFLICT (modify/delete): src/dmd/dcast.d deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/dcast.d left in tree.
CONFLICT (modify/delete): src/dmd/clone.d deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/clone.d left in tree.
CONFLICT (modify/delete): src/dmd/canthrow.d deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/canthrow.d left in tree.
CONFLICT (modify/delete): src/dmd/astenums.d deleted in HEAD and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/astenums.d left in tree.
CONFLICT (modify/delete): src/dmd/astbase.d deleted in HEAwarning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 4342 and retry the command.
D and modified in 206393a42ee11c85234f43c862e04f145c64d62f. Version 206393a42ee11c85234f43c862e04f145c64d62f of src/dmd/astbase.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.