fetching https://github.com/maxhaton/dmd.git withExpr (attempt: 1/3)
From https://github.com/maxhaton/dmd
 * branch                  withExpr   -> FETCH_HEAD

merging FETCH_HEAD
CONFLICT (file location): test/runnable/withexpression.d added in 60a7c6f26355f8e959bd4aa3b8cd9556ddf17066 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable/withexpression.d.
Auto-merging compiler/src/dmd/transitivevisitor.d
Auto-merging compiler/src/dmd/tokens.d
Auto-merging compiler/src/dmd/statementsem.d
Auto-merging compiler/src/dmd/parsetimevisitor.d
Auto-merging compiler/src/dmd/parse.d
Auto-merging compiler/src/dmd/hdrgen.d
CONFLICT (content): Merge conflict in compiler/src/dmd/hdrgen.d
Auto-merging compiler/src/dmd/globals.d
CONFLICT (content): Merge conflict in compiler/src/dmd/globals.d
Auto-merging compiler/src/dmd/frontend.h
CONFLICT (content): Merge conflict in compiler/src/dmd/frontend.h
Auto-merging compiler/src/dmd/expressionsem.d
Auto-merging compiler/src/dmd/expression.d
Auto-merging compiler/src/dmd/e2ir.d
Auto-merging compiler/src/dmd/cli.d
CONFLICT (content): Merge conflict in compiler/src/dmd/cli.d
Automatic merge failed; fix conflicts and then commit the result.