##// END OF EJS Templates
context: use revsymbol() in "merge.preferancestor" code...
Martin von Zweigbergk -
r37372:a6014392 default
parent child Browse files
Show More
@@ -631,7 +631,7 b' class changectx(basectx):'
631 # experimental config: merge.preferancestor
631 # experimental config: merge.preferancestor
632 for r in self._repo.ui.configlist('merge', 'preferancestor'):
632 for r in self._repo.ui.configlist('merge', 'preferancestor'):
633 try:
633 try:
634 ctx = changectx(self._repo, r)
634 ctx = scmutil.revsymbol(self._repo, r)
635 except error.RepoLookupError:
635 except error.RepoLookupError:
636 continue
636 continue
637 anc = ctx.node()
637 anc = ctx.node()
General Comments 0
You need to be logged in to leave comments. Login now