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

merging FETCH_HEAD
CONFLICT (modify/delete): test/runnable/traits.d deleted in HEAD and modified in 810969d27107e3b20480e2b83993dbbe2ade0a7d. Version 810969d27107e3b20480e2b83993dbbe2ade0a7d of test/runnable/traits.d left in tree.
CONFLICT (modify/delete): test/runnable/interpret.d deleted in HEAD and modified in 810969d27107e3b20480e2b83993dbbe2ade0a7d. Version 810969d27107e3b20480e2b83993dbbe2ade0a7d of test/runnable/interpret.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/fail19923.d deleted in HEAD and modified in 810969d27107e3b20480e2b83993dbbe2ade0a7d. Version 810969d27107e3b20480e2b83993dbbe2ade0a7d of test/fail_compilation/fail19923.d left in tree.
CONFLICT (modify/delete): src/dmd/typesem.d deleted in HEAD and modified in 810969d27107e3b20480e2b83993dbbe2ade0a7d. Version 810969d27107e3b20480e2b83993dbbe2ade0a7d of src/dmd/typesem.d left in tree.
CONFLICT (modify/delete): src/dmd/semantic3.d deleted in HEAD and modified in 810969d27107e3b20480e2b83993dbbe2ade0a7d. Version 810969d27107e3b20480e2b83993dbbe2ade0a7d of src/dmd/semantic3.d left in tree.
Auto-merging compiler/test/runnable/xtest46.d
Auto-merging compiler/test/runnable/testptrref.d
Auto-merging compiler/test/runnable/testconst.d
Auto-merging compiler/test/runnable/test42.d
Auto-merging compiler/test/runnable/test4.d
Auto-merging compiler/test/runnable/test28.d
Auto-merging compiler/test/runnable/test23.d
Auto-merging compiler/test/runnable/test15.d
Auto-merging compiler/test/runnable/test12.d
Auto-merging compiler/test/runnable/test11.d
Auto-merging compiler/test/runnable/template4.d
Auto-merging compiler/test/runnable/interface2.d
CONFLICT (file location): test/fail_compilation/fail8059.d added in 810969d27107e3b20480e2b83993dbbe2ade0a7d inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/fail8059.d.
Auto-merging compiler/test/fail_compilation/fail160.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 2686 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.