fetching https://github.com/kinke/dmd.git fix22310_2 (attempt: 1/3) From https://github.com/kinke/dmd * branch fix22310_2 -> 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 4154 and retry the command. CONFLICT (modify/delete): src/dmd/template.h deleted in HEAD and modified in 38536515064b16dccfa9f1e4b6dbe8a7f1a68ae9. Version 38536515064b16dccfa9f1e4b6dbe8a7f1a68ae9 of src/dmd/template.h left in tree. CONFLICT (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in 38536515064b16dccfa9f1e4b6dbe8a7f1a68ae9. Version 38536515064b16dccfa9f1e4b6dbe8a7f1a68ae9 of src/dmd/frontend.h left in tree. CONFLICT (modify/delete): src/dmd/dtemplate.d deleted in HEAD and modified in 38536515064b16dccfa9f1e4b6dbe8a7f1a68ae9. Version 38536515064b16dccfa9f1e4b6dbe8a7f1a68ae9 of src/dmd/dtemplate.d left in tree. CONFLICT (modify/delete): src/dmd/dsymbolsem.d deleted in HEAD and modified in 38536515064b16dccfa9f1e4b6dbe8a7f1a68ae9. Version 38536515064b16dccfa9f1e4b6dbe8a7f1a68ae9 of src/dmd/dsymbolsem.d left in tree. Automatic merge failed; fix conflicts and then commit the result.