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

merging FETCH_HEAD
Auto-merging src/dmd/mars.d
CONFLICT (content): Merge conflict in src/dmd/mars.d
Auto-merging 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/build.d
Automatic merge failed; fix conflicts and then commit the result.