fetching https://github.com/ibuclaw/dmd.git usagedmdparams (attempt: 1/3) From https://github.com/ibuclaw/dmd * branch usagedmdparams -> 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 4388 and retry the command. Auto-merging src/dmd/mars.d CONFLICT (content): Merge conflict in src/dmd/mars.d CONFLICT (modify/delete): src/dmd/globals.h deleted in HEAD and modified in 97e90537b3808a956de40998ee72d34911667814. Version 97e90537b3808a956de40998ee72d34911667814 of src/dmd/globals.h left in tree. CONFLICT (modify/delete): src/dmd/globals.d deleted in HEAD and modified in 97e90537b3808a956de40998ee72d34911667814. Version 97e90537b3808a956de40998ee72d34911667814 of src/dmd/globals.d left in tree. CONFLICT (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in 97e90537b3808a956de40998ee72d34911667814. Version 97e90537b3808a956de40998ee72d34911667814 of src/dmd/frontend.h left in tree. CONFLICT (modify/delete): src/dmd/dmdparams.d deleted in HEAD and modified in 97e90537b3808a956de40998ee72d34911667814. Version 97e90537b3808a956de40998ee72d34911667814 of src/dmd/dmdparams.d left in tree. Automatic merge failed; fix conflicts and then commit the result.