# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1553976790 25200
# 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 -r cab19d49f8bd -r 02fa567f8a3c mercurial/merge.py
--- 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.