[PATCH stable] histedit: sync docstring with edit comment

Augie Fackler raf at durin42.com
Thu Aug 2 09:45:34 CDT 2012


LGTM

Yeah, we can clean that up on default later.

On Thu, Aug 2, 2012 at 9:37 AM, Wagner Bruna
<wagner.bruna+mercurial at gmail.com> wrote:
> # HG changeset patch
> # User Wagner Bruna <wbruna at softwareexpress.com.br>
> # Date 1343917701 10800
> # Branch stable
> # Node ID b04e7823e437d842d6347875de50e1993f030070
> # Parent  e15765c18ebc18448addb955d2b698c75fc8b380
> histedit: sync docstring with edit comment
>
> The docstring should probably reuse the edit comment string instead.
>
> diff --git a/hgext/histedit.py b/hgext/histedit.py
> --- a/hgext/histedit.py
> +++ b/hgext/histedit.py
> @@ -33,7 +33,7 @@ file open in your editor::
>   # Commands:
>   #  p, pick = use commit
>   #  e, edit = use commit, but stop for amending
> - #  f, fold = use commit, but fold into previous commit
> + #  f, fold = use commit, but fold into previous commit (combines N and N-1)
>   #  d, drop = remove commit from history
>   #  m, mess = edit message without changing commit content
>   #
> @@ -52,7 +52,7 @@ would reorganize the file to look like t
>   # Commands:
>   #  p, pick = use commit
>   #  e, edit = use commit, but stop for amending
> - #  f, fold = use commit, but fold into previous commit
> + #  f, fold = use commit, but fold into previous commit (combines N and N-1)
>   #  d, drop = remove commit from history
>   #  m, mess = edit message without changing commit content
>   #


More information about the Mercurial-devel mailing list