fetching https://github.com/BorisCarvajal/dmd.git fix21896 (attempt: 1/3) From https://github.com/BorisCarvajal/dmd * branch fix21896 -> FETCH_HEAD merging FETCH_HEAD CONFLICT (file location): test/compilable/test21896.d added in 2c23ba7dde263944f85a51715fddfb4c02eb7397 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/test21896.d. Auto-merging compiler/src/dmd/frontend.h CONFLICT (content): Merge conflict in compiler/src/dmd/frontend.h Auto-merging compiler/src/dmd/dtemplate.d Auto-merging compiler/src/dmd/dsymbolsem.d Auto-merging compiler/src/dmd/dsymbol.d Auto-merging compiler/src/dmd/declaration.d Automatic merge failed; fix conflicts and then commit the result.