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
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 3855 and retry the command.
CONFLICT (modify/delete): src/dmd/staticcond.d deleted in HEAD and modified in f6b17a0d3da79bf7a947a4149518ff643e49b6aa. Version f6b17a0d3da79bf7a947a4149518ff643e49b6aa of src/dmd/staticcond.d left in tree.
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 (modify/delete): src/dmd/dtemplate.d deleted in HEAD and modified in f6b17a0d3da79bf7a947a4149518ff643e49b6aa. Version f6b17a0d3da79bf7a947a4149518ff643e49b6aa of src/dmd/dtemplate.d left in tree.
CONFLICT (modify/delete): src/dmd/cond.d deleted in HEAD and modified in f6b17a0d3da79bf7a947a4149518ff643e49b6aa. Version f6b17a0d3da79bf7a947a4149518ff643e49b6aa of src/dmd/cond.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.