# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1552198386 28800
# Node ID a5b5ecff5f371ab72eacf8bb833463bdfa23e353
# Parent  72522fe7fb9549c2aca8aaae001303792d0e4217
merge: simplify initialization of "pas"

Differential Revision: https://phab.mercurial-scm.org/D6472

diff -r 72522fe7fb95 -r a5b5ecff5f37 mercurial/merge.py
--- 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])]