Mercurial > public > mercurial-scm > hg-stable

diff mercurial/context.py @ 22207:8dda6f6ff564

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 15 Aug 2014 11:48:05 -0500
parents 269688a398c4 17011b36aac7
children 650b5b6e75ed
line wrap: on
line diff
--- a/mercurial/context.py	Fri Aug 15 23:05:53 2014 +0900
+++ b/mercurial/context.py	Fri Aug 15 11:48:05 2014 -0500
@@ -553,6 +553,8 @@
             anc = cahs[0]
         else:
             for r in self._repo.ui.configlist('merge', 'preferancestor'):
+                if r == '*':
+                    continue
                 ctx = changectx(self._repo, r)
                 anc = ctx.node()
                 if anc in cahs: