equal
deleted
inserted
replaced
4886 |
4886 |
4887 if node: |
4887 if node: |
4888 node = scmutil.revsingle(repo, node).node() |
4888 node = scmutil.revsingle(repo, node).node() |
4889 |
4889 |
4890 if not node and not abort: |
4890 if not node and not abort: |
|
4891 if ui.configbool(b'commands', b'merge.require-rev'): |
|
4892 raise error.Abort( |
|
4893 _( |
|
4894 b'configuration requires specifying revision to merge ' |
|
4895 b'with' |
|
4896 ) |
|
4897 ) |
4891 node = repo[destutil.destmerge(repo)].node() |
4898 node = repo[destutil.destmerge(repo)].node() |
4892 |
4899 |
4893 if opts.get(b'preview'): |
4900 if opts.get(b'preview'): |
4894 # find nodes that are ancestors of p2 but not of p1 |
4901 # find nodes that are ancestors of p2 but not of p1 |
4895 p1 = repo.lookup(b'.') |
4902 p1 = repo.lookup(b'.') |