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

merging FETCH_HEAD
CONFLICT (modify/delete): test/runnable/testkeyword.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/runnable/testkeyword.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/test17451.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/test17451.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/retscope6.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/retscope6.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/objc_class3.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/objc_class3.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/ice9540.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/ice9540.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/ice18753.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/ice18753.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/ice14929.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/ice14929.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/ice11919.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/ice11919.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/fail8373.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/fail8373.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/fail6968.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/fail6968.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/fail3882.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/fail3882.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/fail346.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/fail346.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/fail17969.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/fail17969.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/fail17955.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/fail17955.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/fail17646.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/fail17646.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/fail17.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/fail17.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/fail11720.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/fail11720.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/fail11375.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 3669 and retry the command.
de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/fail11375.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/diag14875.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/diag14875.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/diag10319.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/diag10319.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/depmsg15815.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/depmsg15815.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/depmsg.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/depmsg.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/bug9631.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/bug9631.d left in tree.
CONFLICT (modify/delete): test/fail_compilation/bug8150b.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/fail_compilation/bug8150b.d left in tree.
CONFLICT (modify/delete): test/compilable/extra-files/json.out deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/compilable/extra-files/json.out left in tree.
CONFLICT (modify/delete): test/compilable/depmsg.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of test/compilable/depmsg.d left in tree.
CONFLICT (modify/delete): src/dmd/dsymbol.d deleted in HEAD and modified in bb5da86687de68757e278c77ac8df999d5bcbb4b. Version bb5da86687de68757e278c77ac8df999d5bcbb4b of src/dmd/dsymbol.d left in tree.
Auto-merging compiler/test/fail_compilation/testInference.d
Auto-merging compiler/test/fail_compilation/test18607.d
Auto-merging compiler/test/fail_compilation/nestedtempl3.d
Auto-merging compiler/test/fail_compilation/nestedtempl0.d
Auto-merging compiler/test/fail_compilation/ice9273a.d
Auto-merging compiler/test/fail_compilation/ice4094.d
Auto-merging compiler/test/fail_compilation/ice15922.d
Auto-merging compiler/test/fail_compilation/ice14272.d
Auto-merging compiler/test/fail_compilation/ice14096.d
Auto-merging compiler/test/fail_compilation/ice13816.d
Auto-merging compiler/test/fail_compilation/ice12727.d
Auto-merging compiler/test/fail_compilation/fail344.d
Auto-merging compiler/test/fail_compilation/fail272.d
Auto-merging compiler/test/fail_compilation/fail270.d
Auto-merging compiler/test/fail_compilation/fail20551.d
Auto-merging compiler/test/fail_compilation/fail19202.d
Auto-merging compiler/test/fail_compilation/fail18093.d
Auto-merging compiler/test/fail_compilation/fail13120.d
Auto-merging compiler/test/fail_compilation/fail104.d
Auto-merging compiler/test/fail_compilation/disable.d
Auto-merging compiler/test/fail_compilation/diag9620.d
Auto-merging compiler/test/compilable/sw_transition_field.d
Automatic merge failed; fix conflicts and then commit the result.