changeset 26715 | 652dfb1eff14 |
parent 26699 | 76f20fc8d54d |
child 26757 | 43708f92f471 |
--- a/mercurial/commands.py Thu Oct 15 01:11:00 2015 +0100 +++ b/mercurial/commands.py Thu Oct 15 01:19:32 2015 +0100 @@ -4901,7 +4901,7 @@ node = scmutil.revsingle(repo, node).node() if not node: - node = scmutil.revsingle(repo, '_mergedefaultdest()').node() + node = repo[destutil.destmerge(repo)].node() if opts.get('preview'): # find nodes that are ancestors of p2 but not of p1