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

merging FETCH_HEAD
CONFLICT (modify/delete): src/dmd/parse.d deleted in HEAD and modified in cc0ec2c52054f7070b2c2149a89de74dbec3caac. Version cc0ec2c52054f7070b2c2149a89de74dbec3caac of src/dmd/parse.d left in tree.
CONFLICT (modify/delete): src/dmd/dtemplate.d deleted in HEAD and modified in cc0ec2c52054f7070b2c2149a89de74dbec3caac. Version cc0ec2c52054f7070b2c2149a89de74dbec3caac of src/dmd/dtemplate.d left in tree.
CONFLICT (modify/delete): src/dmd/dsymbolsem.d deleted in HEAD and modified in cc0ec2c52054f7070b2c2149a89de74dbec3caac. Version cc0ec2c52054f7070b2c2149a89de74dbec3caac of src/dmd/dsymbolsem.d left in tree.
CONFLICT (file location): test/compilable/testshareddtor.d added in cc0ec2c52054f7070b2c2149a89de74dbec3caac inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/testshareddtor.d.
CONFLICT (file location): test/fail_compilation/fail12004.d added in cc0ec2c52054f7070b2c2149a89de74dbec3caac inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/compilable/fail12004.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 3921 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.