diff tests/test-tutorial.t @ 1470:c3f6e97c71b1

merge with stable
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 30 Jun 2015 18:32:12 -0700
parents 8ca31deb8db7 71a3aa0349c5
children 54394d2aaf5e 3c7f98753e37
line wrap: on
line diff
--- a/tests/test-tutorial.t	Fri Jun 26 00:07:13 2015 -0700
+++ b/tests/test-tutorial.t	Tue Jun 30 18:32:12 2015 -0700
@@ -480,9 +480,8 @@
   
   fold multiple revisions into a single one
   
-      Folds a set of revisions with the parent of the working directory. All
-      revisions linearly between the given revisions and the parent of the
-      working directory will also be folded.
+      By default, folds all the revisions linearly between the given revisions
+      and the parent of the working directory.
   
       Use --exact for folding only the specified revisions while ignoring the
       parent of the working directory. In this case, the given revisions must