##// END OF EJS Templates
merge: replace a repo.lookup('.') by more typical repo['.'].node()...
Martin von Zweigbergk -
r44640:293cab97 default
parent child Browse files
Show More
@@ -4881,7 +4881,7 b' def merge(ui, repo, node=None, **opts):'
4881
4881
4882 if opts.get(b'preview'):
4882 if opts.get(b'preview'):
4883 # find nodes that are ancestors of p2 but not of p1
4883 # find nodes that are ancestors of p2 but not of p1
4884 p1 = repo.lookup(b'.')
4884 p1 = repo[b'.'].node()
4885 p2 = node
4885 p2 = node
4886 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4886 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4887
4887
General Comments 0
You need to be logged in to leave comments. Login now