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

merging FETCH_HEAD
CONFLICT (modify/delete): test/tools/d_do_test.d deleted in HEAD and modified in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/tools/d_do_test.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/wc3.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/wc3.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/wc2.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/wc2.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/wc.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/wc.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/untag.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/untag.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/testthread2.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/testthread2.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/testmmfile.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/testmmfile.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/testline.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/testline.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/testbitarray.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/testbitarray.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/test5305.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/test5305.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/test27.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/test27.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/test24.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/test24.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/test2.sh deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/test2.sh left in tree.
CONFLICT (rename/delete): test/runnable_phobos/test18545.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/test18545.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/test18076.sh deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/test18076.sh left in tree.
CONFLICT (rename/delete): test/runnable_phobos/test15568.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/test15568.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/test13117b.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/test13117b.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/test13117.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/test13117.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/test12197.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/test12197.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/test10942.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/test10942.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/stress.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/stress.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/paranoia.sh deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/paranoia.sh left in tree.
CONFLICT (rename/delete): test/runnable_phobos/link11069b.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/link11069b.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/lazy.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/lazy.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/issue8671.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/issue8671.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/integrate.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/integrate.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/imports/test27a.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/imports/test27a.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/imports/test24b.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/imports/test24b.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/imports/test24a.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/imports/test24a.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/imports/test11931d.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/imports/test11931d.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/imports/test11931a.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/imports/test11931a.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/ifti.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/ifti.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/hospital.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/hospital.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/extra-files/test2.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/extra-files/test2.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/extra-files/paranoia.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/extra-files/paranoia.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/dhry.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/dhry.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/ctorpowtests.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/ctorpowtests.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/constfold.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/constfold.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/complex.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/complex.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/builtin.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/builtin.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/arrayop.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/arrayop.d left in tree.
CONFLICT (rename/delete): test/runnable_phobos/argufilem.d deleted in HEAD and renamed in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable_phobos/argufilem.d left in tree.
CONFLICT (modify/delete): test/runnable/xtest46.d deleted in HEAD and modified in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable/xtest46.d left in tree.
CONFLICT (modify/delete): test/runnable/ufcs.d deleted in HEAD and modified in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable/ufcs.d left in tree.
CONFLICT (modify/delete): test/runnable/testdstress.d deleted in HEAD and modified in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable/testdstress.d left in tree.
CONFLICT (modify/delete): test/runnable/testassign.d deleted in HEAD and modified in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable/testassign.d left in tree.
CONFLICT (modify/delete): test/runnable/testaa2.d deleted in HEAD and modified in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable/testaa2.d left in tree.
CONFLICT (modify/delete): test/runnable/testaa.d deleted in HEAD and modified in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable/testaa.d left in tree.
CONFLICT (modify/delete): test/runnable/test34.d deleted in HEAD and modified in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable/test34.d left in tree.
CONFLICT (modify/delete): test/runnable/test28.d deleted in HEAD and modified in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable/test28.d left in tree.
CONFLICT (modify/delete): test/runnable/test23.d deleted in HEAD and modified in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable/test23.d left in tree.
CONFLICT (modify/delete): test/runnable/test22.d deleted in HEAD and modified in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable/test22.d left in tree.
CONFLICT (modify/delete): test/runnable/test19.d deleted in HEAD and modified in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable/test19.d left in tree.
CONFLICT (modify/delete): test/runnable/test15.d deleted in HEAD and modified in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable/test15.d left in tree.
CONFLICT (modify/delete): test/runnable/test12.d deleted in HEAD and modified in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable/test12.d left in tree.
CONFLICT (modify/delete): test/runnable/test11.d deleted in HEAD and modified in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/runnable/test11.d left in tree.
CONFLICT (modify/delete): test/run.d deleted in HEAD and modified in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/run.d left in tree.
CONFLICT (modify/delete): test/Makefile deleted in HEAD and modified in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/Makefile left in tree.
CONFLICT (rename/rename): Rename "test/runnable/test9287.sh"->"compiler/test/runnable/test9287.sh" in branch "HEAD" rename "test/runnable/test9287.sh"->"test/runnable_phobos/test9287.sh" in "94b7bd8d8092e0409ba2c44f8f786228da4def77"
CONFLICT (rename/rename): Rename "test/runnable/test8544.d"->"compiler/test/runnable/test8544.d" in branch "HEAD" rename "test/runnable/test8544.d"->"test/runnable_phobos/test8544.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77"
CONFLICT (rename/rename): Rename "test/runnable/test5943.d"->"compiler/test/runnable/test5943.d" in branch "HEAD" rename "test/runnable/test5943.d"->"test/runnable_phobos/test5943.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77"
CONFLICT (rename/rename): Rename "test/runnable/link11931.d"->"compiler/test/runnable/link11931.d" in branch "HEAD" rename "test/runnable/link11931.d"->"test/runnable_phobos/link11931.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77"
CONFLICT (rename/rename): Rename "test/runnable/imports/test11931c.d"->"compiler/test/runnable/imports/test11931c.d" in branch "HEAD" rename "test/runnable/imports/test11931c.d"->"test/runnable_phobos/imports/test11931c.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77"
CONFLICT (rename/rename): Rename "test/runnable/imports/test11931b.d"->"compiler/test/runnable/imports/test11931b.d" in branch "HEAD" rename "test/runnable/imports/test11931b.d"->"test/runnable_phobos/imports/test11931b.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77"
CONFLICT (rename/rename): Rename "test/runnable/imports/link11069z.d"->"compiler/test/runnable/imports/link11069z.d" in branch "HEAD" rename "test/runnable/imports/link11069z.d"->"test/runnable_phobos/imports/link11069z.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77"
CONFLICT (rename/rename): Rename "test/runnable/imports/link11069y.d"->"compiler/test/runnable/imports/link11069y.d" in branch "HEAD" rename "test/runnable/imports/link11069y.d"->"test/runnable_phobos/imports/link11069y.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77"
CONFLICT (rename/rename): Rename "test/runnable/imports/link11069x.d"->"compiler/test/runnable/imports/link11069x.d" in branch "HEAD" rename "test/runnable/imports/link11069x.d"->"test/runnable_phobos/imports/link11069x.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77"
CONFLICT (rename/rename): Rename "test/runnable/imports/argufile.d"->"compiler/test/runnable/imports/argufile.d" in branch "HEAD" rename "test/runnable/imports/argufile.d"->"test/runnable_phobos/imports/argufile.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77"
CONFLICT (rename/rename): Rename "test/runnable/extra-files/untag.html"->"compiler/test/runnable/extra-files/untag.html" in branch "HEAD" rename "test/runnable/extra-files/untag.html"->"test/runnable_phobos/extra-files/untag.html" in "94b7bd8d8092e0409ba2c44f8f786228da4def77"
CONFLICT (rename/rename): Rename "test/runnable/extra-files/test15.txt"->"compiler/test/runnable/extra-files/test15.txt" in branch "HEAD" rename "test/runnable/extra-files/test15.txt"->"test/runnable_phobos/extra-files/test15.txt" in "94b7bd8d8092e0409ba2c44f8f786228da4def77"
CONFLICT (rename/rename): Rename "test/runnable/extra-files/alice30.txt"->"compiler/test/runnable/extra-files/alice30.txt" in branch "HEAD" rename "test/runnable/extra-files/alice30.txt"->"test/runnable_phobos/extra-files/alice30.txtwarning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 3644 and retry the command.
" in "94b7bd8d8092e0409ba2c44f8f786228da4def77"
Automatic merge failed; fix conflicts and then commit the result.