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

merging FETCH_HEAD
Auto-merging druntime/src/core/thread/osthread.d
Auto-merging compiler/src/dmd/func.d
Auto-merging compiler/src/dmd/doc.d
Auto-merging compiler/src/dmd/asttypename.d
CONFLICT (content): Merge conflict in compiler/src/dmd/asttypename.d
Automatic merge failed; fix conflicts and then commit the result.