# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1521483527 25200
# Node ID 8aba29d8b1330e37d52e2721d5cd5ad80e53a0ae
# Parent  d53277cdc1e7432a7765a82b36c9339ea115e33a
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.

diff -r d53277cdc1e7 -r 8aba29d8b133 hgext3rd/evolve/__init__.py
--- 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,