fetching https://github.com/Luhrel/dmd.git fix21155 (attempt: 1/3)
From https://github.com/Luhrel/dmd
 * branch                  fix21155   -> FETCH_HEAD

merging FETCH_HEAD
CONFLICT (file location): test/dshell/extra-files/dwarf/fix21155.d added in 0a39f0405c7b9670f39f2ba76c263a413d2524d3 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/dshell/extra-files/dwarf/fix21155.d.
Auto-merging compiler/test/dshell/extra-files/dwarf/excepted_results/fix22352.txt
CONFLICT (content): Merge conflict in compiler/test/dshell/extra-files/dwarf/excepted_results/fix22352.txt
CONFLICT (file location): test/dshell/extra-files/dwarf/excepted_results/fix21155.txt added in 0a39f0405c7b9670f39f2ba76c263a413d2524d3 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/dshell/extra-files/dwarf/excepted_results/fix21155.txt.
Auto-merging compiler/test/dshell/extra-files/dwarf/excepted_results/fix21153.txt
CONFLICT (content): Merge conflict in compiler/test/dshell/extra-files/dwarf/excepted_results/fix21153.txt
Auto-merging compiler/test/dshell/dwarf.d
Auto-merging compiler/src/dmd/backend/dwarfdbginf.d
CONFLICT (content): Merge conflict in compiler/src/dmd/backend/dwarfdbginf.d
Automatic merge failed; fix conflicts and then commit the result.