fetching https://github.com/BorisCarvajal/dmd.git enumty_tdeduced (attempt: 1/3) From https://github.com/BorisCarvajal/dmd * branch enumty_tdeduced -> FETCH_HEAD merging FETCH_HEAD CONFLICT (modify/delete): src/dmd/mtype.h deleted in HEAD and modified in 6755ef29fb8a6811b16174908c6a8cdf6a74c7d2. Version 6755ef29fb8a6811b16174908c6a8cdf6a74c7d2 of src/dmd/mtype.h left in tree. CONFLICT (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in 6755ef29fb8a6811b16174908c6a8cdf6a74c7d2. Version 6755ef29fb8a6811b16174908c6a8cdf6a74c7d2 of src/dmd/frontend.h left in tree. CONFLICT (modify/delete): src/dmd/dmangle.d deleted in HEAD and modified in 6755ef29fb8a6811b16174908c6a8cdf6a74c7d2. Version 6755ef29fb8a6811b16174908c6a8cdf6a74c7d2 of src/dmd/dmangle.d left in tree. Auto-merging compiler/src/dmd/mtype.d CONFLICT (content): Merge conflict in compiler/src/dmd/mtype.d Auto-merging compiler/src/dmd/dtemplate.d Auto-merging compiler/src/dmd/astbase.d CONFLICT (content): Merge conflict in compiler/src/dmd/astbase.d warning: inexact rename detection was skipped due to too many files. warning: you may want to set your merge.renamelimit variable to at least 2132 and retry the command. Automatic merge failed; fix conflicts and then commit the result.