fetching https://github.com/maxhaton/dmd.git withExpr (attempt: 1/3)
From https://github.com/maxhaton/dmd
 * branch            withExpr   -> 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 4395 and retry the command.
CONFLICT (modify/delete): src/dmd/transitivevisitor.d deleted in HEAD and modified in 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066. Version 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066 of src/dmd/transitivevisitor.d left in tree.
CONFLICT (modify/delete): src/dmd/tokens.d deleted in HEAD and modified in 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066. Version 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066 of src/dmd/tokens.d left in tree.
CONFLICT (modify/delete): src/dmd/statementsem.d deleted in HEAD and modified in 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066. Version 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066 of src/dmd/statementsem.d left in tree.
CONFLICT (modify/delete): src/dmd/parsetimevisitor.d deleted in HEAD and modified in 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066. Version 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066 of src/dmd/parsetimevisitor.d left in tree.
CONFLICT (modify/delete): src/dmd/parse.d deleted in HEAD and modified in 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066. Version 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066 of src/dmd/parse.d left in tree.
CONFLICT (modify/delete): src/dmd/hdrgen.d deleted in HEAD and modified in 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066. Version 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066 of src/dmd/hdrgen.d left in tree.
CONFLICT (modify/delete): src/dmd/globals.d deleted in HEAD and modified in 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066. Version 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066 of src/dmd/globals.d left in tree.
CONFLICT (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066. Version 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066 of src/dmd/frontend.h left in tree.
CONFLICT (modify/delete): src/dmd/expressionsem.d deleted in HEAD and modified in 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066. Version 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066 of src/dmd/expressionsem.d left in tree.
CONFLICT (modify/delete): src/dmd/expression.d deleted in HEAD and modified in 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066. Version 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066 of src/dmd/expression.d left in tree.
CONFLICT (modify/delete): src/dmd/e2ir.d deleted in HEAD and modified in 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066. Version 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066 of src/dmd/e2ir.d left in tree.
CONFLICT (modify/delete): src/dmd/cli.d deleted in HEAD and modified in 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066. Version 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066 of src/dmd/cli.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.