[PATCH] Fixed two small help text errors

[Martin Geisler]

Jens Bäckman <jens.backman at gmail.com> writes:

> # HG changeset patch
> # User Jens Bäckman <jens.backman at gmail.com>
> # Date 1262778115 -3600
> # Node ID d9fd7138337dd846f9c6a9ef6f3f194331bffb95
> # Parent  3ab391dd5ec5ab1f4af06169bde7a9c850a7f4ce
> Fixed two small help text errors

Thanks for catching those!

> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -2443,7 +2443,7 @@
>      will be overwritten if the merge is retried with resolve. The
>      -m/--mark switch should be used to mark the file as resolved.
>
> -    You can specify a set of files to operate on, or use the -a/-all
> +    You can specify a set of files to operate on, or use the -a/--all
>      switch to select all unresolved files.

This hunk went into the stable branch as 712dc3b6db68.

> diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
> --- a/mercurial/subrepo.py
> +++ b/mercurial/subrepo.py
> @@ -312,7 +312,7 @@
>
>      def remove(self):
>          if self.dirty():
> -            self._repo.ui.warn(_('not removing repo %s because'
> +            self._repo.ui.warn(_('not removing repo %s because '
>                                   'it has changes.\n' % self._path))
>              return
>          self._repo.ui.note('removing subrepo %s\n' % self._path)

And then went into the default branch as 192c39586787.

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20100109/6eed15e0/attachment.pgp>