fetching https://github.com/thewilsonator/dmd.git issue-15523 (attempt: 1/3)
From https://github.com/thewilsonator/dmd
 * branch            issue-15523 -> 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 3999 and retry the command.
CONFLICT (modify/delete): src/dmd/target.h deleted in HEAD and modified in 7b94c84e5306702e1aee14fa0d64be3cc7a37075. Version 7b94c84e5306702e1aee14fa0d64be3cc7a37075 of src/dmd/target.h left in tree.
CONFLICT (modify/delete): src/dmd/target.d deleted in HEAD and modified in 7b94c84e5306702e1aee14fa0d64be3cc7a37075. Version 7b94c84e5306702e1aee14fa0d64be3cc7a37075 of src/dmd/target.d left in tree.
CONFLICT (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in 7b94c84e5306702e1aee14fa0d64be3cc7a37075. Version 7b94c84e5306702e1aee14fa0d64be3cc7a37075 of src/dmd/frontend.h left in tree.
CONFLICT (modify/delete): src/dmd/cppmanglewin.d deleted in HEAD and modified in 7b94c84e5306702e1aee14fa0d64be3cc7a37075. Version 7b94c84e5306702e1aee14fa0d64be3cc7a37075 of src/dmd/cppmanglewin.d left in tree.
CONFLICT (modify/delete): src/dmd/cppmangle.d deleted in HEAD and modified in 7b94c84e5306702e1aee14fa0d64be3cc7a37075. Version 7b94c84e5306702e1aee14fa0d64be3cc7a37075 of src/dmd/cppmangle.d left in tree.
Auto-merging compiler/test/runnable_cxx/extra-files/cpp11.cpp
Auto-merging compiler/test/runnable_cxx/cpp11.d
Automatic merge failed; fix conflicts and then commit the result.