fetching https://github.com/ibuclaw/dmd.git issue6856 (attempt: 1/3) From https://github.com/ibuclaw/dmd * branch issue6856 -> 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 3878 and retry the command. CONFLICT (modify/delete): test/runnable/testcontracts.d deleted in HEAD and modified in b6ac9c6f969abafa1bc79b0b074528a155f40d1b. Version b6ac9c6f969abafa1bc79b0b074528a155f40d1b of test/runnable/testcontracts.d left in tree. CONFLICT (modify/delete): src/dmd/semantic3.d deleted in HEAD and modified in b6ac9c6f969abafa1bc79b0b074528a155f40d1b. Version b6ac9c6f969abafa1bc79b0b074528a155f40d1b of src/dmd/semantic3.d left in tree. CONFLICT (modify/delete): src/dmd/func.d deleted in HEAD and modified in b6ac9c6f969abafa1bc79b0b074528a155f40d1b. Version b6ac9c6f969abafa1bc79b0b074528a155f40d1b of src/dmd/func.d left in tree. Automatic merge failed; fix conflicts and then commit the result.