[PATCH] fix comment typo

[Nicolas Dumazet]

On Wed, 11 Aug 2010 20:19:04 +0800
Alecs King <alecsk at gmail.com> wrote:

>  mercurial/merge.py |  2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> 
> # HG changeset patch
> # User Alecs King <alecsk at gmail.com>
> # Date 1281528982 -28800
> # Branch my
> # Node ID 3d4a8bf13a65ac1878774eaaa07a4ae1f944455d
> # Parent  6a5e159eb93ed120407e533bda4eceb0cf7f0435
> fix comment typo

sure, thank you.

Queued to crew.

-Nicolas.

> 
> diff --git a/mercurial/merge.py b/mercurial/merge.py
> --- a/mercurial/merge.py
> +++ b/mercurial/merge.py
> @@ -117,7 +117,7 @@ def _forgetremoved(wctx, mctx, branchmer
>  
>  def manifestmerge(repo, p1, p2, pa, overwrite, partial):
>      """
> -    Merge p1 and p2 with ancestor ma and generate merge action list
> +    Merge p1 and p2 with ancestor pa and generate merge action list
>  
>      overwrite = whether we clobber working files
>      partial = function to filter file lists
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel


-- 
Nicolas Dumazet — NicDumZ