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