fetching https://github.com/nordlow/dmd.git cat-iconv (attempt: 1/3) From https://github.com/nordlow/dmd * branch cat-iconv -> 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 4139 and retry the command. CONFLICT (modify/delete): src/dmd/traits.d deleted in HEAD and modified in b883d6f9f0b0ef54c0b401c0a22b562aa55ac059. Version b883d6f9f0b0ef54c0b401c0a22b562aa55ac059 of src/dmd/traits.d left in tree. CONFLICT (modify/delete): src/dmd/mtype.d deleted in HEAD and modified in b883d6f9f0b0ef54c0b401c0a22b562aa55ac059. Version b883d6f9f0b0ef54c0b401c0a22b562aa55ac059 of src/dmd/mtype.d left in tree. CONFLICT (modify/delete): src/dmd/id.d deleted in HEAD and modified in b883d6f9f0b0ef54c0b401c0a22b562aa55ac059. Version b883d6f9f0b0ef54c0b401c0a22b562aa55ac059 of src/dmd/id.d left in tree. CONFLICT (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in b883d6f9f0b0ef54c0b401c0a22b562aa55ac059. Version b883d6f9f0b0ef54c0b401c0a22b562aa55ac059 of src/dmd/frontend.h left in tree. CONFLICT (modify/delete): src/dmd/dsymbol.d deleted in HEAD and modified in b883d6f9f0b0ef54c0b401c0a22b562aa55ac059. Version b883d6f9f0b0ef54c0b401c0a22b562aa55ac059 of src/dmd/dsymbol.d left in tree. CONFLICT (modify/delete): src/dmd/dcast.d deleted in HEAD and modified in b883d6f9f0b0ef54c0b401c0a22b562aa55ac059. Version b883d6f9f0b0ef54c0b401c0a22b562aa55ac059 of src/dmd/dcast.d left in tree. Automatic merge failed; fix conflicts and then commit the result.