Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 23404:b913c394386f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Nov 2014 12:25:01 -0600
parents 1cbc00ff2373 3bd577a3283e
children 19ebd2f88fc7
comparison
equal deleted inserted replaced
23399:fd5247a88e63 23404:b913c394386f
4522 ('P', 'preview', None, 4522 ('P', 'preview', None,
4523 _('review revisions to merge (no merge is performed)')) 4523 _('review revisions to merge (no merge is performed)'))
4524 ] + mergetoolopts, 4524 ] + mergetoolopts,
4525 _('[-P] [-f] [[-r] REV]')) 4525 _('[-P] [-f] [[-r] REV]'))
4526 def merge(ui, repo, node=None, **opts): 4526 def merge(ui, repo, node=None, **opts):
4527 """merge working directory with another revision 4527 """merge another revision into working directory
4528 4528
4529 The current working directory is updated with all changes made in 4529 The current working directory is updated with all changes made in
4530 the requested revision since the last common predecessor revision. 4530 the requested revision since the last common predecessor revision.
4531 4531
4532 Files that changed between either parent are marked as changed for 4532 Files that changed between either parent are marked as changed for