fetching https://github.com/BorisCarvajal/dmd.git fix21896 (attempt: 1/3)
From https://github.com/BorisCarvajal/dmd
 * branch            fix21896   -> 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 4042 and retry the command.
CONFLICT (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in 2c23ba7dde263944f85a51715fddfb4c02eb7397. Version 2c23ba7dde263944f85a51715fddfb4c02eb7397 of src/dmd/frontend.h left in tree.
CONFLICT (modify/delete): src/dmd/dtemplate.d deleted in HEAD and modified in 2c23ba7dde263944f85a51715fddfb4c02eb7397. Version 2c23ba7dde263944f85a51715fddfb4c02eb7397 of src/dmd/dtemplate.d left in tree.
CONFLICT (modify/delete): src/dmd/dsymbolsem.d deleted in HEAD and modified in 2c23ba7dde263944f85a51715fddfb4c02eb7397. Version 2c23ba7dde263944f85a51715fddfb4c02eb7397 of src/dmd/dsymbolsem.d left in tree.
CONFLICT (modify/delete): src/dmd/dsymbol.d deleted in HEAD and modified in 2c23ba7dde263944f85a51715fddfb4c02eb7397. Version 2c23ba7dde263944f85a51715fddfb4c02eb7397 of src/dmd/dsymbol.d left in tree.
CONFLICT (modify/delete): src/dmd/declaration.d deleted in HEAD and modified in 2c23ba7dde263944f85a51715fddfb4c02eb7397. Version 2c23ba7dde263944f85a51715fddfb4c02eb7397 of src/dmd/declaration.d left in tree.
Auto-merging compiler/test/fail_compilation/aliasassign.d
Automatic merge failed; fix conflicts and then commit the result.