Mercurial > hg
changeset 26715:652dfb1eff14
merge: directly get destination from destutil
There is no real value in using the revset over the function.
The revset have no remaining users and will be taken care of in a later
changesets.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 15 Oct 2015 01:19:32 +0100 |
| parents | 9903261dcc81 |
| children | c027641f8a83 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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