Mercurial > hg
changeset 42410:a5b5ecff5f37
merge: simplify initialization of "pas"
Differential Revision: https://phab.mercurial-scm.org/D6472
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sat, 09 Mar 2019 22:13:06 -0800 |
| parents | 72522fe7fb95 |
| children | 4738c292a520 |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Sat Mar 09 22:11:27 2019 -0800 +++ b/mercurial/merge.py Sat Mar 09 22:13:06 2019 -0800 @@ -1978,10 +1978,9 @@ pl = wc.parents() p1 = pl[0] p2 = repo[node] - pas = [None] if ancestor is not None: pas = [repo[ancestor]] - if pas[0] is None: + else: if repo.ui.configlist('merge', 'preferancestor') == ['*']: cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node()) pas = [repo[anc] for anc in (sorted(cahs) or [nullid])]