diff tests/test-tutorial.t @ 937:43cceb37324c

merge with 3.3.2

--- a/tests/test-tutorial.t	Sun May 11 01:29:11 2014 -0700
+++ b/tests/test-tutorial.t	Wed May 14 16:42:41 2014 -0700
@@ -476,6 +476,8 @@
   $ hg help fold
   hg fold rev
   
+  aliases: squash
+  
   Fold multiple revisions into a single one
   
       The revisions from your current working directory to the given one are
@@ -487,6 +489,8 @@
   options:
   
    -r --rev VALUE [+] explicitly specify the full set of revision to fold
+   -m --message TEXT  use text as commit message
+   -l --logfile FILE  read commit message from file
    -d --date DATE     record the specified date as commit date
    -u --user USER     record the specified user as committer