changeset 25844 | 18541e9510c5 |
parent 25757 | 4d1382fd96ff |
child 26492 | 3a0bb61371c5 |
--- a/mercurial/context.py Thu Jun 25 17:53:16 2015 -0500 +++ b/mercurial/context.py Thu Jun 25 17:54:55 2015 -0500 @@ -576,7 +576,8 @@ elif len(cahs) == 1: anc = cahs[0] else: - for r in self._repo.ui.configlist('merge', 'preferancestor'): + # experimental config: merge.preferancestor + for r in self._repo.ui.configlist('merge', 'preferancestor', ['*']): try: ctx = changectx(self._repo, r) except error.RepoLookupError: