fetching https://github.com/Luhrel/dmd.git fix21158 (attempt: 1/3) From https://github.com/Luhrel/dmd * branch fix21158 -> FETCH_HEAD merging FETCH_HEAD CONFLICT (modify/delete): src/dmd/backend/dwarfdbginf.d deleted in HEAD and modified in 247bf7272794170f543de08052729577524012d1. Version 247bf7272794170f543de08052729577524012d1 of src/dmd/backend/dwarfdbginf.d left in tree. CONFLICT (file location): test/runnable/gdb21158g.d added in 247bf7272794170f543de08052729577524012d1 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to druntime/test/gc/gdb21158g.d. CONFLICT (file location): test/runnable/gdb21158f.d added in 247bf7272794170f543de08052729577524012d1 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to druntime/test/gc/gdb21158f.d. CONFLICT (file location): test/runnable/gdb21158e.d added in 247bf7272794170f543de08052729577524012d1 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to druntime/test/gc/gdb21158e.d. CONFLICT (file location): test/runnable/gdb21158d.d added in 247bf7272794170f543de08052729577524012d1 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to druntime/test/gc/gdb21158d.d. CONFLICT (file location): test/runnable/gdb21158c.d added in 247bf7272794170f543de08052729577524012d1 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to druntime/test/gc/gdb21158c.d. CONFLICT (file location): test/runnable/gdb21158b.d added in 247bf7272794170f543de08052729577524012d1 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to druntime/test/gc/gdb21158b.d. CONFLICT (file location): test/runnable/gdb21158a.d added in 247bf7272794170f543de08052729577524012d1 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to druntime/test/gc/gdb21158a.d. warning: inexact rename detection was skipped due to too many files. warning: you may want to set your merge.renamelimit variable to at least 2137 and retry the command. Automatic merge failed; fix conflicts and then commit the result.