fetching https://github.com/ljmf00/dmd.git improve-error-file-read (attempt: 1/3)
From https://github.com/ljmf00/dmd
 * branch                  improve-error-file-read -> FETCH_HEAD

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