fetching https://github.com/ibuclaw/dmd.git vnrvo (attempt: 1/3) From https://github.com/ibuclaw/dmd * branch vnrvo -> 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 4437 and retry the command. CONFLICT (modify/delete): test/runnable/sdtor.d deleted in HEAD and modified in f98298af43c78ed92fe32e941515a3922a4bb277. Version f98298af43c78ed92fe32e941515a3922a4bb277 of test/runnable/sdtor.d left in tree. CONFLICT (modify/delete): test/runnable/inline.d deleted in HEAD and modified in f98298af43c78ed92fe32e941515a3922a4bb277. Version f98298af43c78ed92fe32e941515a3922a4bb277 of test/runnable/inline.d left in tree. CONFLICT (modify/delete): src/dmd/s2ir.d deleted in HEAD and modified in f98298af43c78ed92fe32e941515a3922a4bb277. Version f98298af43c78ed92fe32e941515a3922a4bb277 of src/dmd/s2ir.d left in tree. Auto-merging src/dmd/mars.d CONFLICT (content): Merge conflict in src/dmd/mars.d CONFLICT (modify/delete): src/dmd/globals.h deleted in HEAD and modified in f98298af43c78ed92fe32e941515a3922a4bb277. Version f98298af43c78ed92fe32e941515a3922a4bb277 of src/dmd/globals.h left in tree. CONFLICT (modify/delete): src/dmd/globals.d deleted in HEAD and modified in f98298af43c78ed92fe32e941515a3922a4bb277. Version f98298af43c78ed92fe32e941515a3922a4bb277 of src/dmd/globals.d left in tree. CONFLICT (modify/delete): src/dmd/cli.d deleted in HEAD and modified in f98298af43c78ed92fe32e941515a3922a4bb277. Version f98298af43c78ed92fe32e941515a3922a4bb277 of src/dmd/cli.d left in tree. Automatic merge failed; fix conflicts and then commit the result.