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 warning: inexact rename detection was skipped due to too many files. warning: you may want to set your merge.renamelimit variable to at least 4041 and retry the command. CONFLICT (modify/delete): test/compilable/reverthelp.d deleted in HEAD and modified in 7ed54812e48eac27add857c9fd8f1bba2a968e67. Version 7ed54812e48eac27add857c9fd8f1bba2a968e67 of test/compilable/reverthelp.d left in tree. 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 (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in 7ed54812e48eac27add857c9fd8f1bba2a968e67. Version 7ed54812e48eac27add857c9fd8f1bba2a968e67 of src/dmd/frontend.h left in tree. CONFLICT (modify/delete): src/dmd/dtemplate.d deleted in HEAD and modified in 7ed54812e48eac27add857c9fd8f1bba2a968e67. Version 7ed54812e48eac27add857c9fd8f1bba2a968e67 of src/dmd/dtemplate.d left in tree. CONFLICT (modify/delete): src/dmd/cli.d deleted in HEAD and modified in 7ed54812e48eac27add857c9fd8f1bba2a968e67. Version 7ed54812e48eac27add857c9fd8f1bba2a968e67 of src/dmd/cli.d left in tree. Automatic merge failed; fix conflicts and then commit the result.