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

merging FETCH_HEAD
CONFLICT (modify/delete): src/dmd/statementsem.d deleted in HEAD and modified in 84b7bb9b266f8c79dbffc2c39682b0c76933993f. Version 84b7bb9b266f8c79dbffc2c39682b0c76933993f of src/dmd/statementsem.d left in tree.
CONFLICT (modify/delete): src/dmd/semantic3.d deleted in HEAD and modified in 84b7bb9b266f8c79dbffc2c39682b0c76933993f. Version 84b7bb9b266f8c79dbffc2c39682b0c76933993f of src/dmd/semantic3.d left in tree.
CONFLICT (modify/delete): src/dmd/expression.h deleted in HEAD and modified in 84b7bb9b266f8c79dbffc2c39682b0c76933993f. Version 84b7bb9b266f8c79dbffc2c39682b0c76933993f of src/dmd/expression.h left in tree.
CONFLICT (modify/delete): src/dmd/expression.d deleted in HEAD and modified in 84b7bb9b266f8c79dbffc2c39682b0c76933993f. Version 84b7bb9b266f8c79dbffc2c39682b0c76933993f of src/dmd/expression.d left in tree.
CONFLICT (modify/delete): src/dmd/dstruct.d deleted in HEAD and modified in 84b7bb9b266f8c79dbffc2c39682b0c76933993f. Version 84b7bb9b266f8c79dbffc2c39682b0c76933993f of src/dmd/dstruct.d left in tree.
CONFLICT (modify/delete): src/dmd/declaration.d deleted in HEAD and modified in 84b7bb9b266f8c79dbffc2c39682b0c76933993f. Version 84b7bb9b266f8c79dbffc2c39682b0c76933993f of src/dmd/declaration.d left in tree.
CONFLICT (modify/delete): src/dmd/aggregate.h deleted in HEAD and modified in 84b7bb9b266f8c79dbffc2c39682b0c76933993f. Version 84b7bb9b266f8c79dbffc2c39682b0c76933993f of src/dmd/aggregate.h left in tree.
CONFLICT (file location): test/fail_compilation/more_moves.d added in 84b7bb9b266f8c79dbffc2c39682b0c76933993f inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/more_moves.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 2306 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.