fetching https://github.com/ibuclaw/dmd.git rmtargetopt (attempt: 1/3)
From https://github.com/ibuclaw/dmd
 * branch            rmtargetopt -> 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 4397 and retry the command.
CONFLICT (modify/delete): test/tools/d_do_test.d deleted in HEAD and modified in 35a01c32e3d00f6a80541e7201a89bc27c642a3b. Version 35a01c32e3d00f6a80541e7201a89bc27c642a3b of test/tools/d_do_test.d left in tree.
CONFLICT (modify/delete): src/dmd/target.h deleted in HEAD and modified in 35a01c32e3d00f6a80541e7201a89bc27c642a3b. Version 35a01c32e3d00f6a80541e7201a89bc27c642a3b of src/dmd/target.h left in tree.
CONFLICT (modify/delete): src/dmd/target.d deleted in HEAD and modified in 35a01c32e3d00f6a80541e7201a89bc27c642a3b. Version 35a01c32e3d00f6a80541e7201a89bc27c642a3b of src/dmd/target.d left in tree.
Auto-merging src/dmd/mars.d
CONFLICT (content): Merge conflict in src/dmd/mars.d
CONFLICT (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in 35a01c32e3d00f6a80541e7201a89bc27c642a3b. Version 35a01c32e3d00f6a80541e7201a89bc27c642a3b of src/dmd/frontend.h left in tree.
CONFLICT (modify/delete): src/dmd/cli.d deleted in HEAD and modified in 35a01c32e3d00f6a80541e7201a89bc27c642a3b. Version 35a01c32e3d00f6a80541e7201a89bc27c642a3b of src/dmd/cli.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.