changeset 26570 | c8b332b1eb1f |
parent 26534 | e4f27fb65da7 |
child 26587 | 56b2bcea2529 |
--- a/mercurial/merge.py Mon Oct 05 01:46:47 2015 -0700 +++ b/mercurial/merge.py Mon Sep 28 22:11:23 2015 -0700 @@ -21,6 +21,7 @@ ) from . import ( copies, + destutil, filemerge, obsolete, subrepo, @@ -994,9 +995,7 @@ pas = [repo[ancestor]] if node is None: - nodes = list(repo.set('_updatedefaultdest()')) - if nodes: - node = nodes[0].node() + node = repo[destutil.destupdate(repo)].node() overwrite = force and not branchmerge