fetching https://github.com/ljmf00/dmd.git fix-call-conv (attempt: 1/3)
From https://github.com/ljmf00/dmd
 * branch                  fix-call-conv -> FETCH_HEAD

merging FETCH_HEAD
CONFLICT (file location): test/runnable/callconv.d added in cf6e49e0abe93ed643f6ccf4dcb9115499d23cb6 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable/callconv.d.
Auto-merging compiler/src/dmd/e2ir.d
Auto-merging compiler/src/dmd/backend/var.d
Automatic merge failed; fix conflicts and then commit the result.