fetching https://github.com/ibuclaw/dmd.git issue15298 (attempt: 1/3) From https://github.com/ibuclaw/dmd * branch issue15298 -> FETCH_HEAD merging FETCH_HEAD CONFLICT (file location): test/compilable/issue21287.d added in 540a71b8d55990a105beeb05d4ff0f849fba020b inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/issue21287.d. CONFLICT (file location): test/compilable/issue15298.d added in 540a71b8d55990a105beeb05d4ff0f849fba020b inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/issue15298.d. Auto-merging compiler/src/dmd/dtemplate.d Automatic merge failed; fix conflicts and then commit the result.