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

merging FETCH_HEAD
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 4363 and retry the command.
CONFLICT (modify/delete): test/compilable/previewhelp.d deleted in HEAD and modified in 3b19493b6ad323df2a834c18167490d1a9b12634. Version 3b19493b6ad323df2a834c18167490d1a9b12634 of test/compilable/previewhelp.d left in tree.
CONFLICT (modify/delete): src/dmd/lexer.d deleted in HEAD and modified in 3b19493b6ad323df2a834c18167490d1a9b12634. Version 3b19493b6ad323df2a834c18167490d1a9b12634 of src/dmd/lexer.d left in tree.
CONFLICT (modify/delete): src/dmd/globals.h deleted in HEAD and modified in 3b19493b6ad323df2a834c18167490d1a9b12634. Version 3b19493b6ad323df2a834c18167490d1a9b12634 of src/dmd/globals.h left in tree.
CONFLICT (modify/delete): src/dmd/globals.d deleted in HEAD and modified in 3b19493b6ad323df2a834c18167490d1a9b12634. Version 3b19493b6ad323df2a834c18167490d1a9b12634 of src/dmd/globals.d left in tree.
CONFLICT (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in 3b19493b6ad323df2a834c18167490d1a9b12634. Version 3b19493b6ad323df2a834c18167490d1a9b12634 of src/dmd/frontend.h left in tree.
CONFLICT (modify/delete): src/dmd/cli.d deleted in HEAD and modified in 3b19493b6ad323df2a834c18167490d1a9b12634. Version 3b19493b6ad323df2a834c18167490d1a9b12634 of src/dmd/cli.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.