fetching https://github.com/9rnsr/dmd.git fix16013 (attempt: 1/3)
From https://github.com/9rnsr/dmd
 * branch            fix16013   -> 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 5014 and retry the command.
CONFLICT (modify/delete): test/runnable/aliasthis.d deleted in HEAD and modified in 68e0cc13f138c7e992124b26a8cd785847d0b2d8. Version 68e0cc13f138c7e992124b26a8cd785847d0b2d8 of test/runnable/aliasthis.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/gag4269f.d deleted in HEAD and modified in 68e0cc13f138c7e992124b26a8cd785847d0b2d8. Version 68e0cc13f138c7e992124b26a8cd785847d0b2d8 of test/fail_compilation/gag4269f.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/fail7851.d deleted in HEAD and modified in 68e0cc13f138c7e992124b26a8cd785847d0b2d8. Version 68e0cc13f138c7e992124b26a8cd785847d0b2d8 of test/fail_compilation/fail7851.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/fail42.d deleted in HEAD and modified in 68e0cc13f138c7e992124b26a8cd785847d0b2d8. Version 68e0cc13f138c7e992124b26a8cd785847d0b2d8 of test/fail_compilation/fail42.d left in tree.
CONFLICT (modify/delete): test/compilable/testfwdref.d deleted in HEAD and modified in 68e0cc13f138c7e992124b26a8cd785847d0b2d8. Version 68e0cc13f138c7e992124b26a8cd785847d0b2d8 of test/compilable/testfwdref.d left in tree.
CONFLICT (modify/delete): src/opover.d deleted in HEAD and modified in 68e0cc13f138c7e992124b26a8cd785847d0b2d8. Version 68e0cc13f138c7e992124b26a8cd785847d0b2d8 of src/opover.d left in tree.
CONFLICT (modify/delete): src/func.d deleted in HEAD and modified in 68e0cc13f138c7e992124b26a8cd785847d0b2d8. Version 68e0cc13f138c7e992124b26a8cd785847d0b2d8 of src/func.d left in tree.
CONFLICT (modify/delete): src/expression.h deleted in HEAD and modified in 68e0cc13f138c7e992124b26a8cd785847d0b2d8. Version 68e0cc13f138c7e992124b26a8cd785847d0b2d8 of src/expression.h left in tree.
CONFLICT (modify/delete): src/expression.d deleted in HEAD and modified in 68e0cc13f138c7e992124b26a8cd785847d0b2d8. Version 68e0cc13f138c7e992124b26a8cd785847d0b2d8 of src/expression.d left in tree.
CONFLICT (modify/delete): src/declaration.d deleted in HEAD and modified in 68e0cc13f138c7e992124b26a8cd785847d0b2d8. Version 68e0cc13f138c7e992124b26a8cd785847d0b2d8 of src/declaration.d left in tree.
CONFLICT (modify/delete): src/dclass.d deleted in HEAD and modified in 68e0cc13f138c7e992124b26a8cd785847d0b2d8. Version 68e0cc13f138c7e992124b26a8cd785847d0b2d8 of src/dclass.d left in tree.
CONFLICT (modify/delete): src/aliasthis.d deleted in HEAD and modified in 68e0cc13f138c7e992124b26a8cd785847d0b2d8. Version 68e0cc13f138c7e992124b26a8cd785847d0b2d8 of src/aliasthis.d left in tree.
CONFLICT (modify/delete): src/aggregate.d deleted in HEAD and modified in 68e0cc13f138c7e992124b26a8cd785847d0b2d8. Version 68e0cc13f138c7e992124b26a8cd785847d0b2d8 of src/aggregate.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.