##// END OF EJS Templates
merge: fix typo in docstring
Alecs King -
r11817:d12fe809 default
parent child Browse files
Show More
@@ -117,7 +117,7 b' def _forgetremoved(wctx, mctx, branchmer'
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
General Comments 0
You need to be logged in to leave comments. Login now