diff -r 44dce874de97 -r 5220c12c43fd mercurial/context.py --- a/mercurial/context.py Wed Apr 30 16:56:23 2014 -0700 +++ b/mercurial/context.py Wed Oct 01 03:40:51 2014 +0200 @@ -558,9 +558,10 @@ anc = cahs[0] else: for r in self._repo.ui.configlist('merge', 'preferancestor'): - if r == '*': + try: + ctx = changectx(self._repo, r) + except error.RepoLookupError: continue - ctx = changectx(self._repo, r) anc = ctx.node() if anc in cahs: break