merge with stable

merge stable heads

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.

filemerge: remove temporary files when using internal:dump as merge-tool

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.

dirstate: filecacheify _branch The opener is relative to .hg, use it in a subclass of filecache to compute the final path.

dirstate: add filecache support

scmutil: add join method to opener to construct path relative to base Useful when we only have the opener without the base path used when it was constructed.