fetching https://github.com/wilzbach/dmd.git fix-20016 (attempt: 1/3) From https://github.com/wilzbach/dmd * branch fix-20016 -> 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 3823 and retry the command. CONFLICT (modify/delete): src/dmd/target.h deleted in HEAD and modified in 5497dfda00001708d4c00653f2291f5b85781bc3. Version 5497dfda00001708d4c00653f2291f5b85781bc3 of src/dmd/target.h left in tree. CONFLICT (modify/delete): src/dmd/target.d deleted in HEAD and modified in 5497dfda00001708d4c00653f2291f5b85781bc3. Version 5497dfda00001708d4c00653f2291f5b85781bc3 of src/dmd/target.d left in tree. Auto-merging src/dmd/mars.d CONFLICT (content): Merge conflict in src/dmd/mars.d CONFLICT (modify/delete): src/dmd/lib.d deleted in HEAD and modified in 5497dfda00001708d4c00653f2291f5b85781bc3. Version 5497dfda00001708d4c00653f2291f5b85781bc3 of src/dmd/lib.d left in tree. CONFLICT (modify/delete): src/dmd/json.d deleted in HEAD and modified in 5497dfda00001708d4c00653f2291f5b85781bc3. Version 5497dfda00001708d4c00653f2291f5b85781bc3 of src/dmd/json.d left in tree. CONFLICT (modify/delete): src/dmd/globals.d deleted in HEAD and modified in 5497dfda00001708d4c00653f2291f5b85781bc3. Version 5497dfda00001708d4c00653f2291f5b85781bc3 of src/dmd/globals.d left in tree. CONFLICT (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in 5497dfda00001708d4c00653f2291f5b85781bc3. Version 5497dfda00001708d4c00653f2291f5b85781bc3 of src/dmd/frontend.h left in tree. CONFLICT (modify/delete): src/build.d deleted in HEAD and modified in 5497dfda00001708d4c00653f2291f5b85781bc3. Version 5497dfda00001708d4c00653f2291f5b85781bc3 of src/build.d left in tree. Automatic merge failed; fix conflicts and then commit the result.