equal
deleted
inserted
replaced
4879 if node is None: |
4879 if node is None: |
4880 raise error.Abort(_(b'merging with the working copy has no effect')) |
4880 raise error.Abort(_(b'merging with the working copy has no effect')) |
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 |
4888 displayer = logcmdutil.changesetdisplayer(ui, repo, opts) |
4888 displayer = logcmdutil.changesetdisplayer(ui, repo, opts) |
4889 for node in nodes: |
4889 for node in nodes: |