fetching https://github.com/BorisCarvajal/dmd.git reduce_tupdecl_size (attempt: 1/3)
From https://github.com/BorisCarvajal/dmd
 * branch            reduce_tupdecl_size -> 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 3936 and retry the command.
CONFLICT (modify/delete): src/dmd/typesem.d deleted in HEAD and modified in 5aa2ae270752e7e9c05b17827965e5087dea3879. Version 5aa2ae270752e7e9c05b17827965e5087dea3879 of src/dmd/typesem.d left in tree.
CONFLICT (modify/delete): src/dmd/mtype.d deleted in HEAD and modified in 5aa2ae270752e7e9c05b17827965e5087dea3879. Version 5aa2ae270752e7e9c05b17827965e5087dea3879 of src/dmd/mtype.d left in tree.
CONFLICT (modify/delete): src/dmd/hdrgen.d deleted in HEAD and modified in 5aa2ae270752e7e9c05b17827965e5087dea3879. Version 5aa2ae270752e7e9c05b17827965e5087dea3879 of src/dmd/hdrgen.d left in tree.
CONFLICT (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in 5aa2ae270752e7e9c05b17827965e5087dea3879. Version 5aa2ae270752e7e9c05b17827965e5087dea3879 of src/dmd/frontend.h left in tree.
CONFLICT (modify/delete): src/dmd/declaration.h deleted in HEAD and modified in 5aa2ae270752e7e9c05b17827965e5087dea3879. Version 5aa2ae270752e7e9c05b17827965e5087dea3879 of src/dmd/declaration.h left in tree.
CONFLICT (modify/delete): src/dmd/declaration.d deleted in HEAD and modified in 5aa2ae270752e7e9c05b17827965e5087dea3879. Version 5aa2ae270752e7e9c05b17827965e5087dea3879 of src/dmd/declaration.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.