fetching https://github.com/wilzbach/dmd.git unit_test (attempt: 1/3)
From https://github.com/wilzbach/dmd
 * branch            unit_test  -> 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 4031 and retry the command.
CONFLICT (modify/delete): test/tools/unit_test_runner.d deleted in HEAD and modified in a31a60c8c124192f3a1254e4354378a45a8d0412. Version a31a60c8c124192f3a1254e4354378a45a8d0412 of test/tools/unit_test_runner.d left in tree.
CONFLICT (modify/delete): test/run.d deleted in HEAD and modified in a31a60c8c124192f3a1254e4354378a45a8d0412. Version a31a60c8c124192f3a1254e4354378a45a8d0412 of test/run.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.