merge stable
authorPierre-Yves David <pierre-yves.david@fb.com>
Wed, 05 Mar 2014 19:08:58 -0800
changeset 868 3ec90de03562
parent 866 c6dc5822e640 (current diff)
parent 867 6a67606e1c34 (diff)
child 869 e9eeef0d07ec
merge stable
hgext/evolve.py
tests/test-tutorial.t
--- a/hgext/evolve.py	Wed Mar 05 15:21:21 2014 -0800
+++ b/hgext/evolve.py	Wed Mar 05 19:08:58 2014 -0800
@@ -1798,8 +1798,8 @@
     without selected changes is created, becomes the new parent and
     obsoletes the previous one.
 
-    The --include option specify pattern to uncommit
-    The --exclude option specify pattern to keep in the commit
+    The --include option specifies patterns to uncommit.
+    The --exclude option specifies patterns to keep in the commit.
 
     Return 0 if changed files are uncommitted.
     """
--- a/tests/test-tutorial.t	Wed Mar 05 15:21:21 2014 -0800
+++ b/tests/test-tutorial.t	Wed Mar 05 19:08:58 2014 -0800
@@ -448,8 +448,8 @@
       changed in the working directory. A new revision without selected changes
       is created, becomes the new parent and obsoletes the previous one.
   
-      The --include option specify pattern to uncommit The --exclude option
-      specify pattern to keep in the commit
+      The --include option specifies patterns to uncommit. The --exclude option
+      specifies patterns to keep in the commit.
   
       Return 0 if changed files are uncommitted.