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

merging FETCH_HEAD
Auto-merging src/dmd/mars.d
CONFLICT (content): Merge conflict in src/dmd/mars.d
Auto-merging compiler/src/dmd/target.d
CONFLICT (content): Merge conflict in compiler/src/dmd/target.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.