merge with stable
mercurial/filemerge.py in the default branch does not need the additional
unlink calls, because the unlink calls at the end of filemerge.filemerge()
are called for internal:dump, too.
Added signature for changeset
53e2cd303ecf
Added tag 2.1.1 for changeset
53e2cd303ecf
dirstate: filecacheify _ignore (
issue3278)
This still doesn't handle the case where a command is run with
--config ui.ignore=path since we only look for changes in .hgignore.