fetching https://github.com/thewilsonator/dmd.git issue-15505 (attempt: 1/3)
From https://github.com/thewilsonator/dmd
 * branch                  issue-15505 -> FETCH_HEAD

merging FETCH_HEAD
CONFLICT (modify/delete): test/compilable/cppmangle.d deleted in HEAD and modified in cf215720b1f9959ffa89f0805ad03f747e0dd318. Version cf215720b1f9959ffa89f0805ad03f747e0dd318 of test/compilable/cppmangle.d left in tree.
Auto-merging compiler/src/dmd/cppmanglewin.d
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 2973 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.