fetching https://github.com/ljmf00/dmd.git rm-buf-outbuf (attempt: 1/3)
From https://github.com/ljmf00/dmd
 * branch            rm-buf-outbuf -> 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 4374 and retry the command.
CONFLICT (modify/delete): src/dmd/common/outbuffer.h deleted in HEAD and modified in f42ac6aa39ca2ef0851fa961c413ba01b864e3fa. Version f42ac6aa39ca2ef0851fa961c413ba01b864e3fa of src/dmd/common/outbuffer.h left in tree.
CONFLICT (modify/delete): src/dmd/common/outbuffer.d deleted in HEAD and modified in f42ac6aa39ca2ef0851fa961c413ba01b864e3fa. Version f42ac6aa39ca2ef0851fa961c413ba01b864e3fa of src/dmd/common/outbuffer.d left in tree.
CONFLICT (modify/delete): src/dmd/backend/machobj.d deleted in HEAD and modified in f42ac6aa39ca2ef0851fa961c413ba01b864e3fa. Version f42ac6aa39ca2ef0851fa961c413ba01b864e3fa of src/dmd/backend/machobj.d left in tree.
CONFLICT (modify/delete): src/dmd/backend/dwarfdbginf.d deleted in HEAD and modified in f42ac6aa39ca2ef0851fa961c413ba01b864e3fa. Version f42ac6aa39ca2ef0851fa961c413ba01b864e3fa of src/dmd/backend/dwarfdbginf.d left in tree.
CONFLICT (modify/delete): src/dmd/backend/dcgcv.d deleted in HEAD and modified in f42ac6aa39ca2ef0851fa961c413ba01b864e3fa. Version f42ac6aa39ca2ef0851fa961c413ba01b864e3fa of src/dmd/backend/dcgcv.d left in tree.
CONFLICT (modify/delete): src/dmd/backend/cv8.d deleted in HEAD and modified in f42ac6aa39ca2ef0851fa961c413ba01b864e3fa. Version f42ac6aa39ca2ef0851fa961c413ba01b864e3fa of src/dmd/backend/cv8.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.