Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 48469:fff5942d445f
typo: s/unkown/unknown across the codebase
Differential Revision: https://phab.mercurial-scm.org/D11807
| author | Rapha?l Gom?s <rgomes@octobus.net> |
|---|---|
| date | Fri, 26 Nov 2021 11:53:54 +0100 |
| parents | 6dc3dc5e9636 |
| children | 38941a28406a |
line wrap: on
line diff
--- a/mercurial/merge.py Thu Nov 25 18:33:51 2021 +0100 +++ b/mercurial/merge.py Fri Nov 26 11:53:54 2021 +0100 @@ -2479,13 +2479,13 @@ if confirm: nb_ignored = len(status.ignored) - nb_unkown = len(status.unknown) - if nb_unkown and nb_ignored: - msg = _(b"permanently delete %d unkown and %d ignored files?") - msg %= (nb_unkown, nb_ignored) - elif nb_unkown: - msg = _(b"permanently delete %d unkown files?") - msg %= nb_unkown + nb_unknown = len(status.unknown) + if nb_unknown and nb_ignored: + msg = _(b"permanently delete %d unknown and %d ignored files?") + msg %= (nb_unknown, nb_ignored) + elif nb_unknown: + msg = _(b"permanently delete %d unknown files?") + msg %= nb_unknown elif nb_ignored: msg = _(b"permanently delete %d ignored files?") msg %= nb_ignored