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

merging FETCH_HEAD
CONFLICT (modify/delete): src/dmd/semantic3.d deleted in HEAD and modified in bbc90704990c6e066b167e91ed99aeb65f7eacdf. Version bbc90704990c6e066b167e91ed99aeb65f7eacdf of src/dmd/semantic3.d left in tree.
CONFLICT (modify/delete): src/dmd/glue.d deleted in HEAD and modified in bbc90704990c6e066b167e91ed99aeb65f7eacdf. Version bbc90704990c6e066b167e91ed99aeb65f7eacdf of src/dmd/glue.d left in tree.
CONFLICT (modify/delete): src/dmd/e2ir.d deleted in HEAD and modified in bbc90704990c6e066b167e91ed99aeb65f7eacdf. Version bbc90704990c6e066b167e91ed99aeb65f7eacdf of src/dmd/e2ir.d left in tree.
CONFLICT (file location): test/compilable/test_ctfeonly.d added in bbc90704990c6e066b167e91ed99aeb65f7eacdf inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/test_ctfeonly.d.
CONFLICT (file location): test/fail_compilation/fail_ctfeonly.d added in bbc90704990c6e066b167e91ed99aeb65f7eacdf inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/fail_ctfeonly.d.
CONFLICT (file location): test/compilable/extra-files/ctfeonly-postscript.sh added in bbc90704990c6e066b167e91ed99aeb65f7eacdf inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/extra-files/ctfeonly-postscript.sh.
Auto-merging compiler/src/dmd/statement.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 2689 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.