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

merging FETCH_HEAD
Auto-merging compiler/src/dmd/mtype.d
CONFLICT (content): Merge conflict in compiler/src/dmd/mtype.d
Automatic merge failed; fix conflicts and then commit the result.