merge with stable
authorYuya Nishihara <yuya@tcha.org>
Sat, 02 Mar 2019 09:41:17 +0900
changeset 41817 169c386cc9d8
parent 41816 78027e7bc544 (current diff)
parent 41796 25fc5b96d1c3 (diff)
child 41818 f6eff9e4de80
merge with stable
hgext/rebase.py
--- a/hgext/rebase.py	Thu Feb 28 04:08:47 2019 +0530
+++ b/hgext/rebase.py	Sat Mar 02 09:41:17 2019 +0900
@@ -767,7 +767,7 @@
       3. Use ``--base`` to select a changeset; rebase will find ancestors
          and their descendants which are not also ancestors of the destination.
 
-      4. If you do not specify any of ``--rev``, ``source``, or ``--base``,
+      4. If you do not specify any of ``--rev``, ``--source``, or ``--base``,
          rebase will use ``--base .`` as above.
 
     If ``--source`` or ``--rev`` is used, special names ``SRC`` and ``ALLSRC``