fetching https://github.com/jacob-carlborg/dmd.git token-equality (attempt: 1/3)
From https://github.com/jacob-carlborg/dmd
 * branch                  token-equality -> FETCH_HEAD

merging FETCH_HEAD
CONFLICT (modify/delete): test/unit/support.d deleted in HEAD and modified in 134db713dd5ed73fe1ccc841902193ac312686ec. Version 134db713dd5ed73fe1ccc841902193ac312686ec of test/unit/support.d left in tree.
CONFLICT (modify/delete): test/tools/unit_test_runner.d deleted in HEAD and modified in 134db713dd5ed73fe1ccc841902193ac312686ec. Version 134db713dd5ed73fe1ccc841902193ac312686ec of test/tools/unit_test_runner.d left in tree.
CONFLICT (modify/delete): src/dmd/tokens.d deleted in HEAD and modified in 134db713dd5ed73fe1ccc841902193ac312686ec. Version 134db713dd5ed73fe1ccc841902193ac312686ec of src/dmd/tokens.d left in tree.
CONFLICT (file location): test/unit/lexer/token/equality.d added in 134db713dd5ed73fe1ccc841902193ac312686ec inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/unit/lexer/token/equality.d.
Auto-merging compiler/src/dmd/root/ctfloat.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 2974 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.