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

merging FETCH_HEAD
CONFLICT (file location): test/fail_compilation/test23134.d added in 540e087173c758661b1603b11029467431eee6d2 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/test23134.d.
Auto-merging compiler/src/dmd/mtype.d
Auto-merging compiler/src/dmd/dcast.d
Automatic merge failed; fix conflicts and then commit the result.