Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/context.py
changeset 22207 8dda6f6ff564
parent 22201 269688a398c4
parent 22180 17011b36aac7
child 22296 650b5b6e75ed 
--- 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:
mercurial