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

merging FETCH_HEAD
CONFLICT (modify/delete): test/compilable/testVRP.d deleted in HEAD and modified in 2614955bd6c8d3b96220ced8589b2503d80d966f. Version 2614955bd6c8d3b96220ced8589b2503d80d966f of test/compilable/testVRP.d left in tree.
CONFLICT (modify/delete): src/ddmd/intrange.d deleted in HEAD and modified in 2614955bd6c8d3b96220ced8589b2503d80d966f. Version 2614955bd6c8d3b96220ced8589b2503d80d966f of src/ddmd/intrange.d left in tree.
CONFLICT (modify/delete): src/ddmd/constfold.d deleted in HEAD and modified in 2614955bd6c8d3b96220ced8589b2503d80d966f. Version 2614955bd6c8d3b96220ced8589b2503d80d966f of src/ddmd/constfold.d left in tree.
CONFLICT (modify/delete): src/ddmd/blockexit.d deleted in HEAD and modified in 2614955bd6c8d3b96220ced8589b2503d80d966f. Version 2614955bd6c8d3b96220ced8589b2503d80d966f of src/ddmd/blockexit.d left in tree.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 4342 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.