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

merging FETCH_HEAD
CONFLICT (modify/delete): test/runnable/xtest46.d deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of test/runnable/xtest46.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/test9176.d deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of test/fail_compilation/test9176.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/ice9806.d deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of test/fail_compilation/ice9806.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/ice8255.d deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of test/fail_compilation/ice8255.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/ice16035.d deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of test/fail_compilation/ice16035.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/ice14929.d deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of test/fail_compilation/ice14929.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/ice14642.d deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of test/fail_compilation/ice14642.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/ice10922.d deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of test/fail_compilation/ice10922.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/fail14407.d deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of test/fail_compilation/fail14407.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/disable.d deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of test/fail_compilation/disable.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/diag7747.d deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of test/fail_compilation/diag7747.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/diag13028.d deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of test/fail_compilation/diag13028.d left in tree.
CONFLICT (modify/delete): test/compilable/testInference.d deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of test/compilable/testInference.d left in tree.
CONFLICT (modify/delete): src/statementsem.d deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of src/statementsem.d left in tree.
CONFLICT (modify/delete): src/mtype.d deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of src/mtype.d left in tree.
CONFLICT (modify/delete): src/glue.c deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of src/glue.c left in tree.
CONFLICT (modify/delete): src/func.d deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of src/func.d left in tree.
CONFLICT (modify/delete): src/expression.h deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of src/expression.h left in tree.
CONFLICT (modify/delete): src/expression.d deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5ddwarning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 5006 and retry the command.
083101b35112759d01d0ce7a39906c5be of src/expression.d left in tree.
CONFLICT (modify/delete): src/dtemplate.d deleted in HEAD and modified in b9ef5dd083101b35112759d01d0ce7a39906c5be. Version b9ef5dd083101b35112759d01d0ce7a39906c5be of src/dtemplate.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.