Mercurial > evolve

changeset 3574:8aba29d8b133

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
previous/next: add -m short form for --merge This matches core's option to `hg update`. This patch also covers `hg next`, but test-check-commit.t only lets me mention one of them.
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 19 Mar 2018 11:18:47 -0700
parents d53277cdc1e7
children 97530d6e340d
files hgext3rd/evolve/__init__.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/__init__.py	Sun Mar 18 17:29:32 2018 +0530
+++ b/hgext3rd/evolve/__init__.py	Mon Mar 19 11:18:47 2018 -0700
@@ -1023,7 +1023,7 @@
     '^previous',
     [('B', 'move-bookmark', False,
         _('move active bookmark after update')),
-     ('', 'merge', False, _('bring uncommitted change along')),
+     ('m', 'merge', False, _('bring uncommitted change along')),
      ('', 'no-topic', False, _('ignore topic and move topologically')),
      ('n', 'dry-run', False,
         _('do not perform actions, just print what would be done'))],
@@ -1073,7 +1073,7 @@
     '^next',
     [('B', 'move-bookmark', False,
         _('move active bookmark after update')),
-     ('', 'merge', False, _('bring uncommitted change along')),
+     ('m', 'merge', False, _('bring uncommitted change along')),
      ('', 'evolve', False, _('evolve the next changeset if necessary')),
      ('', 'no-topic', False, _('ignore topic and move topologically')),
      ('n', 'dry-run', False,