fetching https://github.com/kinke/dmd.git parse_fp (attempt: 1/3)
From https://github.com/kinke/dmd
 * branch            parse_fp   -> 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 3785 and retry the command.
CONFLICT (modify/delete): test/runnable/test23.d deleted in HEAD and modified in c7d218b4e789c7ecd9195bebef6090fc2a774489. Version c7d218b4e789c7ecd9195bebef6090fc2a774489 of test/runnable/test23.d left in tree.
CONFLICT (modify/delete): test/runnable/test22.d deleted in HEAD and modified in c7d218b4e789c7ecd9195bebef6090fc2a774489. Version c7d218b4e789c7ecd9195bebef6090fc2a774489 of test/runnable/test22.d left in tree.
CONFLICT (modify/delete): test/runnable/ctorpowtests.d deleted in HEAD and modified in c7d218b4e789c7ecd9195bebef6090fc2a774489. Version c7d218b4e789c7ecd9195bebef6090fc2a774489 of test/runnable/ctorpowtests.d left in tree.
CONFLICT (modify/delete): src/dmd/root/strtold.d deleted in HEAD and modified in c7d218b4e789c7ecd9195bebef6090fc2a774489. Version c7d218b4e789c7ecd9195bebef6090fc2a774489 of src/dmd/root/strtold.d left in tree.
CONFLICT (modify/delete): src/dmd/root/port.h deleted in HEAD and modified in c7d218b4e789c7ecd9195bebef6090fc2a774489. Version c7d218b4e789c7ecd9195bebef6090fc2a774489 of src/dmd/root/port.h left in tree.
CONFLICT (modify/delete): src/dmd/root/port.d deleted in HEAD and modified in c7d218b4e789c7ecd9195bebef6090fc2a774489. Version c7d218b4e789c7ecd9195bebef6090fc2a774489 of src/dmd/root/port.d left in tree.
CONFLICT (modify/delete): src/dmd/root/ctfloat.h deleted in HEAD and modified in c7d218b4e789c7ecd9195bebef6090fc2a774489. Version c7d218b4e789c7ecd9195bebef6090fc2a774489 of src/dmd/root/ctfloat.h left in tree.
CONFLICT (modify/delete): src/dmd/root/ctfloat.d deleted in HEAD and modified in c7d218b4e789c7ecd9195bebef6090fc2a774489. Version c7d218b4e789c7ecd9195bebef6090fc2a774489 of src/dmd/root/ctfloat.d left in tree.
CONFLICT (modify/delete): src/dmd/lexer.d deleted in HEAD and modified in c7d218b4e789c7ecd9195bebef6090fc2a774489. Version c7d218b4e789c7ecd9195bebef6090fc2a774489 of src/dmd/lexer.d left in tree.
CONFLICT (modify/delete): src/dmd/hdrgen.d deleted in HEAD and modified in c7d218b4e789c7ecd9195bebef6090fc2a774489. Version c7d218b4e789c7ecd9195bebef6090fc2a774489 of src/dmd/hdrgen.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.