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

merging FETCH_HEAD
Auto-merging compiler/test/fail_compilation/retscope.d
Auto-merging compiler/src/dmd/frontend.h
Auto-merging compiler/src/dmd/escape.d
CONFLICT (content): Merge conflict in compiler/src/dmd/escape.d
Auto-merging compiler/src/dmd/declaration.d
Automatic merge failed; fix conflicts and then commit the result.