Submitter | phabricator |
---|---|
Date | March 30, 2019, 8:53 p.m. |
Message ID | <differential-rev-PHID-DREV-2zhi3yivtdk7zkpd3ssr-req@phab.mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/39420/ |
State | Superseded |
Headers | show |
Comments
Patch
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.