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

merging FETCH_HEAD
Auto-merging src/dmd/mars.d
CONFLICT (content): Merge conflict in src/dmd/mars.d
CONFLICT (modify/delete): src/dmd/dmdparams.d deleted in HEAD and modified in 97e90537b3808a956de40998ee72d34911667814. Version 97e90537b3808a956de40998ee72d34911667814 of src/dmd/dmdparams.d left in tree.
Auto-merging compiler/src/dmd/globals.h
Auto-merging compiler/src/dmd/globals.d
Auto-merging compiler/src/dmd/frontend.h
CONFLICT (content): Merge conflict in compiler/src/dmd/frontend.h
Automatic merge failed; fix conflicts and then commit the result.