doc: fix mistake about matching against directories in "pattern.txt" This fixes mistake of documentation about matching against directories in "pattern.txt" introduced by 50db996bccaf. ".hgignore" treats specified "glob:" pattern as same as one specified for "-X" option: it can match against directories, too. For reference, extra regexp string appended to specified pattern for each types are listed below: see also "match.match()" and "match._regex()" for detail. ============= ========== =============== type cmdline -I/-X ============= ========== =============== glob/relglob '$' '(?:/|$)' path/relpath '(?:/|$)' '(?:/|$)' re/relre (none) (none) ============= ========== =============== Appending '$' means that the specified pattern should match against only files.

dispatch: make "_checkshellalias()" invoke "findcmd()" with "strict=True" Before this patch, shell alias may be executed by abbreviated command name unexpectedly, even if abbreviated command name matches also against the command provided by extension. For example, "rebate" shell alias is executed by "hg reba", even if rebase extension (= "rebase" command) is enabled. In this case, "hg reba" should be aborted because of command name ambiguity. This patch makes "_checkshellalias()" invoke "cmdutil.findcmd()" always with "strict=True" (default value). If abbreviated command name matches against only one shell alias even after loading extensions, such shell alias will be executed via "_parse()". This patch doesn't remove "_checkshellalias()" invocation itself, because it may prevent shell alias from loading extensions uselessly.

rebase: abort cleanly when we encounter a damaged rebasestate (issue4155)

i18n-ja: change phrasing for "or"

i18n-ja: fix some quoting problems for space character usage

i18n-ja: synchronized with f493c2f67430