##// END OF EJS Templates
merge: avoid unnecessary conversion from binary nodeid to binary nodeid...
Martin von Zweigbergk -
r37497:d665b4ea default
parent child Browse files
Show More
@@ -3587,7 +3587,7 def merge(ui, repo, node=None, **opts):
3587 3587 if opts.get('preview'):
3588 3588 # find nodes that are ancestors of p2 but not of p1
3589 3589 p1 = repo.lookup('.')
3590 p2 = repo.lookup(node)
3590 p2 = node
3591 3591 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3592 3592
3593 3593 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
General Comments 0
You need to be logged in to leave comments. Login now