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

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