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

merging FETCH_HEAD
Auto-merging compiler/src/dmd/typinf.d
CONFLICT (content): Merge conflict in compiler/src/dmd/typinf.d
Auto-merging compiler/src/dmd/toobj.d
CONFLICT (content): Merge conflict in compiler/src/dmd/toobj.d
Auto-merging compiler/src/dmd/todt.d
CONFLICT (content): Merge conflict in compiler/src/dmd/todt.d
Auto-merging compiler/src/dmd/e2ir.d
CONFLICT (content): Merge conflict in compiler/src/dmd/e2ir.d
Automatic merge failed; fix conflicts and then commit the result.