fetching https://github.com/ibuclaw/dmd.git tambig (attempt: 1/3)
From https://github.com/ibuclaw/dmd
 * branch            tambig     -> 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 4287 and retry the command.
CONFLICT (modify/delete): src/dmd/statementsem.d deleted in HEAD and modified in 151618afe9b8fc2e7fcdb674be1b6eb1525de6e7. Version 151618afe9b8fc2e7fcdb674be1b6eb1525de6e7 of src/dmd/statementsem.d left in tree.
CONFLICT (modify/delete): src/dmd/mtype.h deleted in HEAD and modified in 151618afe9b8fc2e7fcdb674be1b6eb1525de6e7. Version 151618afe9b8fc2e7fcdb674be1b6eb1525de6e7 of src/dmd/mtype.h left in tree.
CONFLICT (modify/delete): src/dmd/mtype.d deleted in HEAD and modified in 151618afe9b8fc2e7fcdb674be1b6eb1525de6e7. Version 151618afe9b8fc2e7fcdb674be1b6eb1525de6e7 of src/dmd/mtype.d left in tree.
CONFLICT (modify/delete): src/dmd/hdrgen.d deleted in HEAD and modified in 151618afe9b8fc2e7fcdb674be1b6eb1525de6e7. Version 151618afe9b8fc2e7fcdb674be1b6eb1525de6e7 of src/dmd/hdrgen.d left in tree.
CONFLICT (modify/delete): src/dmd/expressionsem.d deleted in HEAD and modified in 151618afe9b8fc2e7fcdb674be1b6eb1525de6e7. Version 151618afe9b8fc2e7fcdb674be1b6eb1525de6e7 of src/dmd/expressionsem.d left in tree.
CONFLICT (modify/delete): src/dmd/dsymbolsem.d deleted in HEAD and modified in 151618afe9b8fc2e7fcdb674be1b6eb1525de6e7. Version 151618afe9b8fc2e7fcdb674be1b6eb1525de6e7 of src/dmd/dsymbolsem.d left in tree.
CONFLICT (modify/delete): src/dmd/dmangle.d deleted in HEAD and modified in 151618afe9b8fc2e7fcdb674be1b6eb1525de6e7. Version 151618afe9b8fc2e7fcdb674be1b6eb1525de6e7 of src/dmd/dmangle.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.