localrepo: clear the filecache on _rollback() and destroyed() This restores the old behaviour of clearing the filecache when the repo is destroyed but combines it with also clearing it on _rollback. Before, we tried to only call it through _rollback but that ruined callers of destroyed. Doing it on both code paths covers destroyed being called from somewhere else, e.g. strip.

help: add 'mergetools' alias for the 'merge-tools' help topic The '-' in 'merge-tools' is surprising but necessary in the configuration. Let's help those who forget that and are looking for help.