fetching https://github.com/Luhrel/dmd.git fix21155 (attempt: 1/3)
From https://github.com/Luhrel/dmd
 * branch            fix21155   -> 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 4188 and retry the command.
CONFLICT (modify/delete): test/dshell/extra-files/dwarf/excepted_results/fix22352.txt deleted in HEAD and modified in 0a39f0405c7b9670f39f2ba76c263a413d2524d3. Version 0a39f0405c7b9670f39f2ba76c263a413d2524d3 of test/dshell/extra-files/dwarf/excepted_results/fix22352.txt left in tree.
CONFLICT (modify/delete): test/dshell/extra-files/dwarf/excepted_results/fix21153.txt deleted in HEAD and modified in 0a39f0405c7b9670f39f2ba76c263a413d2524d3. Version 0a39f0405c7b9670f39f2ba76c263a413d2524d3 of test/dshell/extra-files/dwarf/excepted_results/fix21153.txt left in tree.
CONFLICT (modify/delete): test/dshell/dwarf.d deleted in HEAD and modified in 0a39f0405c7b9670f39f2ba76c263a413d2524d3. Version 0a39f0405c7b9670f39f2ba76c263a413d2524d3 of test/dshell/dwarf.d left in tree.
CONFLICT (modify/delete): src/dmd/backend/dwarfdbginf.d deleted in HEAD and modified in 0a39f0405c7b9670f39f2ba76c263a413d2524d3. Version 0a39f0405c7b9670f39f2ba76c263a413d2524d3 of src/dmd/backend/dwarfdbginf.d left in tree.
Auto-merging compiler/test/runnable/gdb_slice_debuginfo_64.d
Auto-merging compiler/test/runnable/gdb_slice_debuginfo_32.d
Auto-merging compiler/test/dshell/extra-files/dwarf/excepted_results/issue22423.txt
Automatic merge failed; fix conflicts and then commit the result.