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 (modify/delete): test/Makefile deleted in HEAD and modified in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of test/Makefile left in tree. CONFLICT (file location): test/runnable/hospital.d renamed to test/runnable_phobos/hospital.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/hospital.d. CONFLICT (rename/rename): Rename "test/runnable/hospital.d"->"druntime/test/gc/hospital.d" in branch "HEAD" rename "test/runnable/hospital.d"->"compiler/test/runnable_phobos/hospital.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" Auto-merging druntime/test/gc/hospital.d and compiler/test/runnable_phobos/hospital.d, both renamed from test/runnable/hospital.d CONFLICT (file location): test/runnable_phobos/xtest46.d added in 94b7bd8d8092e0409ba2c44f8f786228da4def77 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/xtest46.d. CONFLICT (file location): test/runnable_phobos/ufcs.d added in 94b7bd8d8092e0409ba2c44f8f786228da4def77 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/ufcs.d. CONFLICT (file location): test/runnable/testmmfile.d renamed to test/runnable_phobos/testmmfile.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/testmmfile.d. CONFLICT (rename/delete): test/runnable/testmmfile.d deleted in HEAD and renamed to compiler/test/runnable_phobos/testmmfile.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/testmmfile.d left in tree. CONFLICT (file location): test/runnable/testbitarray.d renamed to test/runnable_phobos/testbitarray.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/testbitarray.d. CONFLICT (rename/delete): test/runnable/testbitarray.d deleted in HEAD and renamed to compiler/test/runnable_phobos/testbitarray.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/testbitarray.d left in tree. CONFLICT (file location): test/runnable_phobos/testassign.d added in 94b7bd8d8092e0409ba2c44f8f786228da4def77 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/testassign.d. CONFLICT (file location): test/runnable_phobos/testaa2.d added in 94b7bd8d8092e0409ba2c44f8f786228da4def77 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/testaa2.d. CONFLICT (file location): test/runnable_phobos/testaa.d added in 94b7bd8d8092e0409ba2c44f8f786228da4def77 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/testaa.d. CONFLICT (file location): test/runnable/test5305.d renamed to test/runnable_phobos/test5305.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test5305.d. CONFLICT (rename/delete): test/runnable/test5305.d deleted in HEAD and renamed to compiler/test/runnable_phobos/test5305.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/test5305.d left in tree. CONFLICT (file location): test/runnable_phobos/test34.d added in 94b7bd8d8092e0409ba2c44f8f786228da4def77 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test34.d. CONFLICT (file location): test/runnable_phobos/test28.d added in 94b7bd8d8092e0409ba2c44f8f786228da4def77 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test28.d. CONFLICT (file location): test/runnable/test24.d renamed to test/runnable_phobos/test24.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test24.d. CONFLICT (rename/delete): test/runnable/test24.d deleted in HEAD and renamed to compiler/test/runnable_phobos/test24.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/test24.d left in tree. CONFLICT (file location): test/runnable_phobos/test23.d added in 94b7bd8d8092e0409ba2c44f8f786228da4def77 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test23.d. CONFLICT (file location): test/runnable_phobos/test22.d added in 94b7bd8d8092e0409ba2c44f8f786228da4def77 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test22.d. CONFLICT (file location): test/runnable/test2.sh renamed to test/runnable_phobos/test2.sh in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test2.sh. CONFLICT (rename/delete): test/runnable/test2.sh deleted in HEAD and renamed to compiler/test/runnable_phobos/test2.sh in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/test2.sh left in tree. CONFLICT (file location): test/runnable_phobos/test19.d added in 94b7bd8d8092e0409ba2c44f8f786228da4def77 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test19.d. CONFLICT (file location): test/runnable/test15568.d renamed to test/runnable_phobos/test15568.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test15568.d. CONFLICT (rename/delete): test/runnable/test15568.d deleted in HEAD and renamed to compiler/test/runnable_phobos/test15568.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/test15568.d left in tree. CONFLICT (file location): test/runnable_phobos/test15.d added in 94b7bd8d8092e0409ba2c44f8f786228da4def77 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test15.d. CONFLICT (file location): test/runnable_phobos/test12.d added in 94b7bd8d8092e0409ba2c44f8f786228da4def77 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test12.d. CONFLICT (file location): test/runnable_phobos/test11.d added in 94b7bd8d8092e0409ba2c44f8f786228da4def77 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test11.d. CONFLICT (file location): test/runnable/test10942.d renamed to test/runnable_phobos/test10942.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test10942.d. CONFLICT (rename/delete): test/runnable/test10942.d deleted in HEAD and renamed to compiler/test/runnable_phobos/test10942.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/test10942.d left in tree. CONFLICT (file location): test/runnable/paranoia.sh renamed to test/runnable_phobos/paranoia.sh in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/paranoia.sh. CONFLICT (rename/delete): test/runnable/paranoia.sh deleted in HEAD and renamed to compiler/test/runnable_phobos/paranoia.sh in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/paranoia.sh left in tree. CONFLICT (file location): test/runnable/issue8671.d renamed to test/runnable_phobos/issue8671.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/issue8671.d. CONFLICT (rename/delete): test/runnable/issue8671.d deleted in HEAD and renamed to compiler/test/runnable_phobos/issue8671.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/issue8671.d left in tree. CONFLICT (file location): test/runnable/imports/test27a.d renamed to test/runnable_phobos/imports/test27a.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/imports/test27a.d. CONFLICT (rename/delete): test/runnable/imports/test27a.d deleted in HEAD and renamed to compiler/test/runnable_phobos/imports/test27a.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/imports/test27a.d left in tree. CONFLICT (file location): test/runnable/imports/test24b.d renamed to test/runnable_phobos/imports/test24b.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/imports/test24b.d. CONFLICT (rename/delete): test/runnable/imports/test24b.d deleted in HEAD and renamed to compiler/test/runnable_phobos/imports/test24b.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/imports/test24b.d left in tree. CONFLICT (file location): test/runnable/imports/test24a.d renamed to test/runnable_phobos/imports/test24a.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/imports/test24a.d. CONFLICT (rename/delete): test/runnable/imports/test24a.d deleted in HEAD and renamed to compiler/test/runnable_phobos/imports/test24a.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/imports/test24a.d left in tree. CONFLICT (file location): test/runnable/imports/test11931d.d renamed to test/runnable_phobos/imports/test11931d.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/imports/test11931d.d. CONFLICT (rename/delete): test/runnable/imports/test11931d.d deleted in HEAD and renamed to compiler/test/runnable_phobos/imports/test11931d.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/imports/test11931d.d left in tree. CONFLICT (file location): test/runnable/ifti.d renamed to test/runnable_phobos/ifti.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/ifti.d. CONFLICT (rename/delete): test/runnable/ifti.d deleted in HEAD and renamed to compiler/test/runnable_phobos/ifti.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/ifti.d left in tree. CONFLICT (file location): test/runnable/extra-files/paranoia.d renamed to test/runnable_phobos/extra-files/paranoia.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/extra-files/paranoia.d. CONFLICT (rename/delete): test/runnable/extra-files/paranoia.d deleted in HEAD and renamed to compiler/test/runnable_phobos/extra-files/paranoia.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/extra-files/paranoia.d left in tree. CONFLICT (file location): test/runnable/constfold.d renamed to test/runnable_phobos/constfold.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/constfold.d. CONFLICT (rename/delete): test/runnable/constfold.d deleted in HEAD and renamed to compiler/test/runnable_phobos/constfold.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/constfold.d left in tree. CONFLICT (file location): test/runnable/complex.d renamed to test/runnable_phobos/complex.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/complex.d. CONFLICT (rename/delete): test/runnable/complex.d deleted in HEAD and renamed to compiler/test/runnable_phobos/complex.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/complex.d left in tree. CONFLICT (file location): test/runnable/builtin.d renamed to test/runnable_phobos/builtin.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/builtin.d. CONFLICT (rename/delete): test/runnable/builtin.d deleted in HEAD and renamed to compiler/test/runnable_phobos/builtin.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/builtin.d left in tree. CONFLICT (file location): test/runnable/arrayop.d renamed to test/runnable_phobos/arrayop.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/arrayop.d. CONFLICT (rename/delete): test/runnable/arrayop.d deleted in HEAD and renamed to compiler/test/runnable_phobos/arrayop.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77. Version 94b7bd8d8092e0409ba2c44f8f786228da4def77 of compiler/test/runnable_phobos/arrayop.d left in tree. Auto-merging compiler/test/runnable/xtest46.d CONFLICT (file location): test/runnable/wc3.d renamed to test/runnable_phobos/wc3.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/wc3.d. CONFLICT (rename/rename): Rename "test/runnable/wc3.d"->"compiler/test/runnable/wc3.d" in branch "HEAD" rename "test/runnable/wc3.d"->"compiler/test/runnable_phobos/wc3.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" Auto-merging compiler/test/runnable/wc3.d and compiler/test/runnable_phobos/wc3.d, both renamed from test/runnable/wc3.d CONFLICT (file location): test/runnable/wc2.d renamed to test/runnable_phobos/wc2.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/wc2.d. CONFLICT (rename/rename): Rename "test/runnable/wc2.d"->"compiler/test/runnable/wc2.d" in branch "HEAD" rename "test/runnable/wc2.d"->"compiler/test/runnable_phobos/wc2.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" Auto-merging compiler/test/runnable/wc2.d and compiler/test/runnable_phobos/wc2.d, both renamed from test/runnable/wc2.d CONFLICT (file location): test/runnable/wc.d renamed to test/runnable_phobos/wc.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/wc.d. CONFLICT (rename/rename): Rename "test/runnable/wc.d"->"compiler/test/runnable/wc.d" in branch "HEAD" rename "test/runnable/wc.d"->"compiler/test/runnable_phobos/wc.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" Auto-merging compiler/test/runnable/wc.d and compiler/test/runnable_phobos/wc.d, both renamed from test/runnable/wc.d CONFLICT (file location): test/runnable/untag.d renamed to test/runnable_phobos/untag.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/untag.d. CONFLICT (rename/rename): Rename "test/runnable/untag.d"->"compiler/test/runnable/untag.d" in branch "HEAD" rename "test/runnable/untag.d"->"compiler/test/runnable_phobos/untag.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" Auto-merging compiler/test/runnable/untag.d and compiler/test/runnable_phobos/untag.d, both renamed from test/runnable/untag.d Auto-merging compiler/test/runnable/ufcs.d CONFLICT (content): Merge conflict in compiler/test/runnable/ufcs.d CONFLICT (file location): test/runnable/testthread2.d renamed to test/runnable_phobos/testthread2.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/testthread2.d. CONFLICT (rename/rename): Rename "test/runnable/testthread2.d"->"compiler/test/runnable/testthread2.d" in branch "HEAD" rename "test/runnable/testthread2.d"->"compiler/test/runnable_phobos/testthread2.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/testline.d renamed to test/runnable_phobos/testline.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/testline.d. CONFLICT (rename/rename): Rename "test/runnable/testline.d"->"compiler/test/runnable/testline.d" in branch "HEAD" rename "test/runnable/testline.d"->"compiler/test/runnable_phobos/testline.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" Auto-merging compiler/test/runnable/testdstress.d CONFLICT (content): Merge conflict in compiler/test/runnable/testdstress.d Auto-merging compiler/test/runnable/testassign.d CONFLICT (content): Merge conflict in compiler/test/runnable/testassign.d Auto-merging compiler/test/runnable/testaa2.d Auto-merging compiler/test/runnable/testaa.d CONFLICT (content): Merge conflict in compiler/test/runnable/testaa.d CONFLICT (file location): test/runnable/test9287.sh renamed to test/runnable_phobos/test9287.sh in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test9287.sh. CONFLICT (rename/rename): Rename "test/runnable/test9287.sh"->"compiler/test/runnable/test9287.sh" in branch "HEAD" rename "test/runnable/test9287.sh"->"compiler/test/runnable_phobos/test9287.sh" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/test8544.d renamed to test/runnable_phobos/test8544.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test8544.d. CONFLICT (rename/rename): Rename "test/runnable/test8544.d"->"compiler/test/runnable/test8544.d" in branch "HEAD" rename "test/runnable/test8544.d"->"compiler/test/runnable_phobos/test8544.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/test5943.d renamed to test/runnable_phobos/test5943.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test5943.d. CONFLICT (rename/rename): Rename "test/runnable/test5943.d"->"compiler/test/runnable/test5943.d" in branch "HEAD" rename "test/runnable/test5943.d"->"compiler/test/runnable_phobos/test5943.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" Auto-merging compiler/test/runnable/test34.d CONFLICT (content): Merge conflict in compiler/test/runnable/test34.d Auto-merging compiler/test/runnable/test28.d CONFLICT (content): Merge conflict in compiler/test/runnable/test28.d CONFLICT (file location): test/runnable/test27.d renamed to test/runnable_phobos/test27.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test27.d. CONFLICT (rename/rename): Rename "test/runnable/test27.d"->"compiler/test/runnable/test27.d" in branch "HEAD" rename "test/runnable/test27.d"->"compiler/test/runnable_phobos/test27.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" Auto-merging compiler/test/runnable/test23.d CONFLICT (content): Merge conflict in compiler/test/runnable/test23.d Auto-merging compiler/test/runnable/test22.d CONFLICT (content): Merge conflict in compiler/test/runnable/test22.d CONFLICT (file location): test/runnable/extra-files/test2.d renamed to test/runnable_phobos/extra-files/test2.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/extra-files/test2.d. CONFLICT (rename/rename): Rename "test/runnable/extra-files/test2.d"->"compiler/test/runnable/test2.d" in branch "HEAD" rename "test/runnable/extra-files/test2.d"->"compiler/test/runnable_phobos/extra-files/test2.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" Auto-merging compiler/test/runnable/test19.d CONFLICT (file location): test/runnable/test18545.d renamed to test/runnable_phobos/test18545.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test18545.d. CONFLICT (rename/rename): Rename "test/runnable/test18545.d"->"compiler/test/runnable/test18545.d" in branch "HEAD" rename "test/runnable/test18545.d"->"compiler/test/runnable_phobos/test18545.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/test18076.sh renamed to test/runnable_phobos/test18076.sh in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test18076.sh. CONFLICT (rename/rename): Rename "test/runnable/test18076.sh"->"compiler/test/runnable/test18076.sh" in branch "HEAD" rename "test/runnable/test18076.sh"->"compiler/test/runnable_phobos/test18076.sh" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" Auto-merging compiler/test/runnable/test15.d CONFLICT (content): Merge conflict in compiler/test/runnable/test15.d CONFLICT (file location): test/runnable/test13117b.d renamed to test/runnable_phobos/test13117b.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test13117b.d. CONFLICT (rename/rename): Rename "test/runnable/test13117b.d"->"compiler/test/runnable/test13117b.d" in branch "HEAD" rename "test/runnable/test13117b.d"->"compiler/test/runnable_phobos/test13117b.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/test13117.d renamed to test/runnable_phobos/test13117.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test13117.d. CONFLICT (rename/rename): Rename "test/runnable/test13117.d"->"compiler/test/runnable/test13117.d" in branch "HEAD" rename "test/runnable/test13117.d"->"compiler/test/runnable_phobos/test13117.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/test12197.d renamed to test/runnable_phobos/test12197.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/test12197.d. CONFLICT (rename/rename): Rename "test/runnable/test12197.d"->"compiler/test/runnable/test12197.d" in branch "HEAD" rename "test/runnable/test12197.d"->"compiler/test/runnable_phobos/test12197.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" Auto-merging compiler/test/runnable/test12.d CONFLICT (content): Merge conflict in compiler/test/runnable/test12.d Auto-merging compiler/test/runnable/test11.d CONFLICT (content): Merge conflict in compiler/test/runnable/test11.d CONFLICT (file location): test/runnable/stress.d renamed to test/runnable_phobos/stress.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/stress.d. CONFLICT (rename/rename): Rename "test/runnable/stress.d"->"compiler/test/runnable/stress.d" in branch "HEAD" rename "test/runnable/stress.d"->"compiler/test/runnable_phobos/stress.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/link11931.d renamed to test/runnable_phobos/link11931.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/link11931.d. CONFLICT (rename/rename): Rename "test/runnable/link11931.d"->"compiler/test/runnable/link11931.d" in branch "HEAD" rename "test/runnable/link11931.d"->"compiler/test/runnable_phobos/link11931.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/link11069b.d renamed to test/runnable_phobos/link11069b.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/link11069b.d. CONFLICT (rename/rename): Rename "test/runnable/link11069b.d"->"compiler/test/runnable/link11069b.d" in branch "HEAD" rename "test/runnable/link11069b.d"->"compiler/test/runnable_phobos/link11069b.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/lazy.d renamed to test/runnable_phobos/lazy.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/lazy.d. CONFLICT (rename/rename): Rename "test/runnable/lazy.d"->"compiler/test/runnable/lazy.d" in branch "HEAD" rename "test/runnable/lazy.d"->"compiler/test/runnable_phobos/lazy.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/integrate.d renamed to test/runnable_phobos/integrate.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/integrate.d. CONFLICT (rename/rename): Rename "test/runnable/integrate.d"->"compiler/test/runnable/integrate.d" in branch "HEAD" rename "test/runnable/integrate.d"->"compiler/test/runnable_phobos/integrate.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/imports/test11931c.d renamed to test/runnable_phobos/imports/test11931c.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/imports/test11931c.d. CONFLICT (rename/rename): Rename "test/runnable/imports/test11931c.d"->"compiler/test/runnable/imports/test11931c.d" in branch "HEAD" rename "test/runnable/imports/test11931c.d"->"compiler/test/runnable_phobos/imports/test11931c.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/imports/test11931b.d renamed to test/runnable_phobos/imports/test11931b.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/imports/test11931b.d. CONFLICT (rename/rename): Rename "test/runnable/imports/test11931b.d"->"compiler/test/runnable/imports/test11931b.d" in branch "HEAD" rename "test/runnable/imports/test11931b.d"->"compiler/test/runnable_phobos/imports/test11931b.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/imports/test11931a.d renamed to test/runnable_phobos/imports/test11931a.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/imports/test11931a.d. CONFLICT (rename/rename): Rename "test/runnable/imports/test11931a.d"->"compiler/test/runnable/imports/test11931a.d" in branch "HEAD" rename "test/runnable/imports/test11931a.d"->"compiler/test/runnable_phobos/imports/test11931a.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/imports/link11069z.d renamed to test/runnable_phobos/imports/link11069z.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/imports/link11069z.d. CONFLICT (rename/rename): Rename "test/runnable/imports/link11069z.d"->"compiler/test/runnable/imports/link11069z.d" in branch "HEAD" rename "test/runnable/imports/link11069z.d"->"compiler/test/runnable_phobos/imports/link11069z.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/imports/link11069y.d renamed to test/runnable_phobos/imports/link11069y.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/imports/link11069y.d. CONFLICT (rename/rename): Rename "test/runnable/imports/link11069y.d"->"compiler/test/runnable/imports/link11069y.d" in branch "HEAD" rename "test/runnable/imports/link11069y.d"->"compiler/test/runnable_phobos/imports/link11069y.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/imports/link11069x.d renamed to test/runnable_phobos/imports/link11069x.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/imports/link11069x.d. CONFLICT (rename/rename): Rename "test/runnable/imports/link11069x.d"->"compiler/test/runnable/imports/link11069x.d" in branch "HEAD" rename "test/runnable/imports/link11069x.d"->"compiler/test/runnable_phobos/imports/link11069x.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/imports/argufile.d renamed to test/runnable_phobos/imports/argufile.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/imports/argufile.d. CONFLICT (rename/rename): Rename "test/runnable/imports/argufile.d"->"compiler/test/runnable/imports/argufile.d" in branch "HEAD" rename "test/runnable/imports/argufile.d"->"compiler/test/runnable_phobos/imports/argufile.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/extra-files/untag.html renamed to test/runnable_phobos/extra-files/untag.html in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/extra-files/untag.html. 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"->"compiler/test/runnable_phobos/extra-files/untag.html" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/extra-files/test15.txt renamed to test/runnable_phobos/extra-files/test15.txt in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/extra-files/test15.txt. 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"->"compiler/test/runnable_phobos/extra-files/test15.txt" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/extra-files/alice30.txt renamed to test/runnable_phobos/extra-files/alice30.txt in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/extra-files/alice30.txt. 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"->"compiler/test/runnable_phobos/extra-files/alice30.txt" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/dhry.d renamed to test/runnable_phobos/dhry.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/dhry.d. CONFLICT (rename/rename): Rename "test/runnable/dhry.d"->"compiler/test/runnable/dhry.d" in branch "HEAD" rename "test/runnable/dhry.d"->"compiler/test/runnable_phobos/dhry.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/ctorpowtests.d renamed to test/runnable_phobos/ctorpowtests.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/ctorpowtests.d. CONFLICT (rename/rename): Rename "test/runnable/ctorpowtests.d"->"compiler/test/runnable/ctorpowtests.d" in branch "HEAD" rename "test/runnable/ctorpowtests.d"->"compiler/test/runnable_phobos/ctorpowtests.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" CONFLICT (file location): test/runnable/argufilem.d renamed to test/runnable_phobos/argufilem.d in 94b7bd8d8092e0409ba2c44f8f786228da4def77, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/runnable_phobos/argufilem.d. CONFLICT (rename/rename): Rename "test/runnable/argufilem.d"->"compiler/test/runnable/argufilem.d" in branch "HEAD" rename "test/runnable/argufilem.d"->"compiler/test/runnable_phobos/argufilem.d" in "94b7bd8d8092e0409ba2c44f8f786228da4def77" Auto-merging compiler/test/run.d CONFLICT (content): Merge conflict in compiler/test/run.d warning: inexact rename detection was skipped due to too many files. warning: you may want to set your merge.renamelimit variable to at least 2686 and retry the command. Automatic merge failed; fix conflicts and then commit the result.