fetching https://github.com/ntrel/dmd.git alias-qual (attempt: 1/3) From https://github.com/ntrel/dmd * branch alias-qual -> FETCH_HEAD merging FETCH_HEAD CONFLICT (modify/delete): src/dmd/globals.d deleted in HEAD and modified in 7ed54812e48eac27add857c9fd8f1bba2a968e67. Version 7ed54812e48eac27add857c9fd8f1bba2a968e67 of src/dmd/globals.d left in tree. CONFLICT (file location): test/compilable/b20863rev.d added in 7ed54812e48eac27add857c9fd8f1bba2a968e67 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/b20863rev.d. CONFLICT (file location): test/compilable/b20863.d added in 7ed54812e48eac27add857c9fd8f1bba2a968e67 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/b20863.d. Auto-merging compiler/test/compilable/reverthelp.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/cli.d Automatic merge failed; fix conflicts and then commit the result.