# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2019-03-30 20:13:10
# Node ID 02fa567f8a3c9b0a20c5ce00a1475980f4902f5a
# Parent  cab19d49f8bdff9efb21240316fe846be38fe0e7

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

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -2205,7 +2205,7 @@ def update(repo, node, branchmerge, forc
                   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.