Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 23400:3bd577a3283e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: be precise about what merged into what in short desc
author anatoly techtonik <techtonik@gmail.com>
date Wed, 26 Nov 2014 17:22:09 +0300
parents 7867f15b4a38
children b913c394386f 759202b64f49
comparison
equal deleted inserted replaced
23383:7f8d27e1f862 23400:3bd577a3283e
4533 ('P', 'preview', None, 4533 ('P', 'preview', None,
4534 _('review revisions to merge (no merge is performed)')) 4534 _('review revisions to merge (no merge is performed)'))
4535 ] + mergetoolopts, 4535 ] + mergetoolopts,
4536 _('[-P] [-f] [[-r] REV]')) 4536 _('[-P] [-f] [[-r] REV]'))
4537 def merge(ui, repo, node=None, **opts): 4537 def merge(ui, repo, node=None, **opts):
4538 """merge working directory with another revision 4538 """merge another revision into working directory
4539 4539
4540 The current working directory is updated with all changes made in 4540 The current working directory is updated with all changes made in
4541 the requested revision since the last common predecessor revision. 4541 the requested revision since the last common predecessor revision.
4542 4542
4543 Files that changed between either parent are marked as changed for 4543 Files that changed between either parent are marked as changed for