fetching https://github.com/kinke/dmd.git match (attempt: 1/3)
From https://github.com/kinke/dmd
 * branch            match      -> 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 3734 and retry the command.
CONFLICT (modify/delete): src/dmd/toobj.d deleted in HEAD and modified in 81392be99347ac7d19f8b2f301c826a10dc4bd6a. Version 81392be99347ac7d19f8b2f301c826a10dc4bd6a of src/dmd/toobj.d left in tree.
CONFLICT (modify/delete): src/dmd/template.h deleted in HEAD and modified in 81392be99347ac7d19f8b2f301c826a10dc4bd6a. Version 81392be99347ac7d19f8b2f301c826a10dc4bd6a of src/dmd/template.h left in tree.
CONFLICT (modify/delete): src/dmd/opover.d deleted in HEAD and modified in 81392be99347ac7d19f8b2f301c826a10dc4bd6a. Version 81392be99347ac7d19f8b2f301c826a10dc4bd6a of src/dmd/opover.d left in tree.
CONFLICT (modify/delete): src/dmd/mtype.d deleted in HEAD and modified in 81392be99347ac7d19f8b2f301c826a10dc4bd6a. Version 81392be99347ac7d19f8b2f301c826a10dc4bd6a of src/dmd/mtype.d left in tree.
CONFLICT (modify/delete): src/dmd/func.d deleted in HEAD and modified in 81392be99347ac7d19f8b2f301c826a10dc4bd6a. Version 81392be99347ac7d19f8b2f301c826a10dc4bd6a of src/dmd/func.d left in tree.
CONFLICT (modify/delete): src/dmd/expressionsem.d deleted in HEAD and modified in 81392be99347ac7d19f8b2f301c826a10dc4bd6a. Version 81392be99347ac7d19f8b2f301c826a10dc4bd6a of src/dmd/expressionsem.d left in tree.
CONFLICT (modify/delete): src/dmd/dtemplate.d deleted in HEAD and modified in 81392be99347ac7d19f8b2f301c826a10dc4bd6a. Version 81392be99347ac7d19f8b2f301c826a10dc4bd6a of src/dmd/dtemplate.d left in tree.
CONFLICT (modify/delete): src/dmd/declaration.h deleted in HEAD and modified in 81392be99347ac7d19f8b2f301c826a10dc4bd6a. Version 81392be99347ac7d19f8b2f301c826a10dc4bd6a of src/dmd/declaration.h left in tree.
CONFLICT (modify/delete): src/dmd/declaration.d deleted in HEAD and modified in 81392be99347ac7d19f8b2f301c826a10dc4bd6a. Version 81392be99347ac7d19f8b2f301c826a10dc4bd6a of src/dmd/declaration.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.