equal
deleted
inserted
replaced
2106 if parent not in bheads: |
2106 if parent not in bheads: |
2107 raise util.Abort(_('working dir not at a head rev - ' |
2107 raise util.Abort(_('working dir not at a head rev - ' |
2108 'use "hg update" or merge with an explicit rev')) |
2108 'use "hg update" or merge with an explicit rev')) |
2109 node = parent == bheads[0] and bheads[-1] or bheads[0] |
2109 node = parent == bheads[0] and bheads[-1] or bheads[0] |
2110 |
2110 |
2111 if opts.get('show'): |
2111 if opts.get('preview'): |
2112 p1 = repo['.'] |
2112 p1 = repo['.'] |
2113 p2 = repo[node] |
2113 p2 = repo[node] |
2114 common = p1.ancestor(p2) |
2114 common = p1.ancestor(p2) |
2115 roots, heads = [common.node()], [p2.node()] |
2115 roots, heads = [common.node()], [p2.node()] |
2116 displayer = cmdutil.show_changeset(ui, repo, opts) |
2116 displayer = cmdutil.show_changeset(ui, repo, opts) |
3356 _('[-r REV]')), |
3356 _('[-r REV]')), |
3357 "^merge": |
3357 "^merge": |
3358 (merge, |
3358 (merge, |
3359 [('f', 'force', None, _('force a merge with outstanding changes')), |
3359 [('f', 'force', None, _('force a merge with outstanding changes')), |
3360 ('r', 'rev', '', _('revision to merge')), |
3360 ('r', 'rev', '', _('revision to merge')), |
3361 ('S', 'show', None, |
3361 ('P', 'preview', None, |
3362 _('review revisions to merge (no merge is performed)'))], |
3362 _('review revisions to merge (no merge is performed)'))], |
3363 _('[-f] [[-r] REV]')), |
3363 _('[-f] [[-r] REV]')), |
3364 "outgoing|out": |
3364 "outgoing|out": |
3365 (outgoing, |
3365 (outgoing, |
3366 [('f', 'force', None, |
3366 [('f', 'force', None, |