equal
deleted
inserted
replaced
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 |