fetching https://github.com/nordlow/dmd.git memoize (attempt: 1/3) From https://github.com/nordlow/dmd * branch memoize -> 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 4185 and retry the command. CONFLICT (modify/delete): src/dmd/tokens.d deleted in HEAD and modified in 1ac4bdbe53c882da75521b8de3fefac410d286db. Version 1ac4bdbe53c882da75521b8de3fefac410d286db of src/dmd/tokens.d left in tree. CONFLICT (modify/delete): src/dmd/parse.d deleted in HEAD and modified in 1ac4bdbe53c882da75521b8de3fefac410d286db. Version 1ac4bdbe53c882da75521b8de3fefac410d286db of src/dmd/parse.d left in tree. Auto-merging src/dmd/mars.d CONFLICT (content): Merge conflict in src/dmd/mars.d CONFLICT (modify/delete): src/dmd/lexer.d deleted in HEAD and modified in 1ac4bdbe53c882da75521b8de3fefac410d286db. Version 1ac4bdbe53c882da75521b8de3fefac410d286db of src/dmd/lexer.d left in tree. CONFLICT (modify/delete): src/dmd/globals.h deleted in HEAD and modified in 1ac4bdbe53c882da75521b8de3fefac410d286db. Version 1ac4bdbe53c882da75521b8de3fefac410d286db of src/dmd/globals.h left in tree. CONFLICT (modify/delete): src/dmd/globals.d deleted in HEAD and modified in 1ac4bdbe53c882da75521b8de3fefac410d286db. Version 1ac4bdbe53c882da75521b8de3fefac410d286db of src/dmd/globals.d left in tree. CONFLICT (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in 1ac4bdbe53c882da75521b8de3fefac410d286db. Version 1ac4bdbe53c882da75521b8de3fefac410d286db of src/dmd/frontend.h left in tree. CONFLICT (modify/delete): src/dmd/expression.d deleted in HEAD and modified in 1ac4bdbe53c882da75521b8de3fefac410d286db. Version 1ac4bdbe53c882da75521b8de3fefac410d286db of src/dmd/expression.d left in tree. CONFLICT (modify/delete): src/dmd/doc.d deleted in HEAD and modified in 1ac4bdbe53c882da75521b8de3fefac410d286db. Version 1ac4bdbe53c882da75521b8de3fefac410d286db of src/dmd/doc.d left in tree. CONFLICT (modify/delete): src/dmd/cli.d deleted in HEAD and modified in 1ac4bdbe53c882da75521b8de3fefac410d286db. Version 1ac4bdbe53c882da75521b8de3fefac410d286db of src/dmd/cli.d left in tree. Automatic merge failed; fix conflicts and then commit the result.