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

merging FETCH_HEAD
CONFLICT (modify/delete): src/toobj.c deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/toobj.c left in tree.
CONFLICT (modify/delete): src/toir.c deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/toir.c left in tree.
CONFLICT (modify/delete): src/todt.d deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/todt.d left in tree.
CONFLICT (modify/delete): src/toctype.d deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/toctype.d left in tree.
CONFLICT (modify/delete): src/tocsym.c deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/tocsym.c left in tree.
CONFLICT (modify/delete): src/statement.h deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/statement.h left in tree.
CONFLICT (modify/delete): src/statement.d deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/statement.d left in tree.
CONFLICT (modify/delete): src/s2ir.c deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/s2ir.c left in tree.
CONFLICT (modify/delete): src/mtype.h deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/mtype.h left in tree.
CONFLICT (modify/delete): src/mtype.d deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/mtype.d left in tree.
CONFLICT (modify/delete): src/module.h deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/module.h left in tree.
CONFLICT (modify/delete): src/inline.d deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/inline.d left in tree.
CONFLICT (modify/delete): src/iasm.c deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/iasm.c left in tree.
CONFLICT (modify/delete): src/gluelayer.d deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/gluelayer.d left in tree.
CONFLICT (modify/delete): src/glue.c deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/glue.c left in tree.
CONFLICT (modify/delete): src/func.d deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/func.d left in tree.
CONFLICT (modify/delete): src/expression.h deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/expression.h left in tree.
CONFLICT (modify/delete): src/expression.d deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/expression.d left in tree.
CONFLICT (modify/delete): src/enum.h deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/enum.h left in tree.
CONFLICT (modify/delete): src/e2ir.c deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/e2ir.c left in tree.
CONFLICT (modify/delete): src/dsymbol.h deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/dsymbol.h left in tree.
CONFLICT (modify/delete): src/dsymbol.d deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/dsymbol.d left in tree.
CONFLICT (modify/delete): src/dmodule.d deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/dmodule.d left in tree.
CONFLICT (modify/delete): src/denum.d deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/denum.d left in tree.
CONFLICT (modify/delete): src/declaration.h deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/declaration.h left in tree.
CONFLICT (modify/delete): src/dclass.d deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/dclass.d left in tree.
CONFLICT (modify/delete): src/aggregate.h deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/aggregate.h left in tree.
CONFLICT (modify/delete): src/aggregate.d deleted in HEAD and modified in 53abff4be34997132043029a4e6619650e50e97b. Version 53abff4be34997132043029a4e6619650e50e97b of src/aggregate.d left in tree.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 4543 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.