merge: make "labels" argument to graft() optional, like it is for update()
graft() just passes the argument on to update(), and update() doesn't
require it, so graft() shouldn't either.
Differential Revision: https://phab.mercurial-scm.org/D6175
--- a/mercurial/merge.py Sun Mar 31 09:39:02 2019 -0700
+++ b/mercurial/merge.py Sat Mar 30 13:13:10 2019 -0700
@@ -2205,7 +2205,7 @@
error=stats.unresolvedcount)
return stats
-def graft(repo, ctx, pctx, labels, keepparent=False,
+def graft(repo, ctx, pctx, labels=None, keepparent=False,
keepconflictparent=False):
"""Do a graft-like merge.