fetching https://github.com/tim-dlang/dmd.git fix22550 (attempt: 1/3)
From https://github.com/tim-dlang/dmd
 * branch            fix22550   -> 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 4249 and retry the command.
CONFLICT (modify/delete): src/dmd/cppmanglewin.d deleted in HEAD and modified in ec919e60ce3f088af4b74be1b2a373d40eff3a47. Version ec919e60ce3f088af4b74be1b2a373d40eff3a47 of src/dmd/cppmanglewin.d left in tree.
Auto-merging compiler/test/runnable_cxx/extra-files/externmangle.cpp
Auto-merging compiler/test/runnable_cxx/externmangle.d
Automatic merge failed; fix conflicts and then commit the result.