##// END OF EJS Templates
merge: make "labels" argument to graft() optional, like it is for update()...
Martin von Zweigbergk -
r42207:02fa567f default
parent child Browse files
Show More
@@ -2205,7 +2205,7 b' def update(repo, node, branchmerge, forc'
2205 error=stats.unresolvedcount)
2205 error=stats.unresolvedcount)
2206 return stats
2206 return stats
2207
2207
2208 def graft(repo, ctx, pctx, labels, keepparent=False,
2208 def graft(repo, ctx, pctx, labels=None, keepparent=False,
2209 keepconflictparent=False):
2209 keepconflictparent=False):
2210 """Do a graft-like merge.
2210 """Do a graft-like merge.
2211
2211
General Comments 0
You need to be logged in to leave comments. Login now