Mercurial > hg

diff mercurial/merge.py @ 11817:d12fe809e1ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix typo in docstring
author Alecs King <alecsk@gmail.com>
date Wed, 11 Aug 2010 20:16:22 +0800
parents 05deba16c5d5
children ce818cf215dc
line wrap: on
line diff
--- a/mercurial/merge.py	Thu Aug 12 16:42:41 2010 +0800
+++ b/mercurial/merge.py	Wed Aug 11 20:16:22 2010 +0800
@@ -117,7 +117,7 @@
 
 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