diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -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.