Mercurial > hg

comparison 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
comparison
equal deleted inserted replaced
11816:e1359ad582f6 11817:d12fe809e1ee
115 115
116 return action 116 return action
117 117
118 def manifestmerge(repo, p1, p2, pa, overwrite, partial): 118 def manifestmerge(repo, p1, p2, pa, overwrite, partial):
119 """ 119 """
120 Merge p1 and p2 with ancestor ma and generate merge action list 120 Merge p1 and p2 with ancestor pa and generate merge action list
121 121
122 overwrite = whether we clobber working files 122 overwrite = whether we clobber working files
123 partial = function to filter file lists 123 partial = function to filter file lists
124 """ 124 """
125 125