Mercurial > hg-stable
changeset 42040:02fa567f8a3c
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
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sat, 30 Mar 2019 13:13:10 -0700 |
| parents | cab19d49f8bd |
| children | 3e47d1ec9da5 |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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.