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

merging FETCH_HEAD
CONFLICT (file location): test/compilable/test22310.d added in 38536515064b16dccfa9f1e4b6dbe8a7f1a68ae9 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/test22310.d.
Auto-merging compiler/src/dmd/template.h
Auto-merging compiler/src/dmd/frontend.h
Auto-merging compiler/src/dmd/dtemplate.d
Auto-merging compiler/src/dmd/dsymbolsem.d
CONFLICT (content): Merge conflict in compiler/src/dmd/dsymbolsem.d
Automatic merge failed; fix conflicts and then commit the result.