diff tests/test-amend.t @ 6936:a239ea1dfacb default tip

branching: merge with stable

--- a/tests/test-amend.t	Sat Oct 26 11:19:50 2024 +0400
+++ b/tests/test-amend.t	Fri Nov 22 16:53:42 2024 +0400
@@ -131,6 +131,7 @@
 setting the user after we have performed the test with no username
   $ HGUSER=test
 
+#if hg69
 Check the help
   $ hg amend -h
   hg amend [OPTION]... [FILE]...
@@ -139,18 +140,18 @@
   
   combine a changeset with updates and replace it with a new one
   
-      Commits a new changeset incorporating both the changes to the given files
-      and all the changes from the current parent changeset into the repository.
+  Commits a new changeset incorporating both the changes to the given files and
+  all the changes from the current parent changeset into the repository.
   
-      See 'hg commit' for details about committing changes.
+  See 'hg commit' for details about committing changes.
   
-      If you don't specify -m, the parent's message will be reused.
+  If you don't specify -m, the parent's message will be reused.
   
-      If --extract is specified, the behavior of 'hg amend' is reversed: Changes
-      to selected files in the checked out revision appear again as uncommitted
-      changed in the working directory.
+  If --extract is specified, the behavior of 'hg amend' is reversed: Changes to
+  selected files in the checked out revision appear again as uncommitted changed
+  in the working directory.
   
-      Returns 0 on success, 1 if nothing changed.
+  Returns 0 on success, 1 if nothing changed.
   
   options ([+] can be repeated):
   
@@ -175,6 +176,7 @@
    -i --interactive         use interactive mode
   
   (some details hidden, use --verbose to show complete help)
+#endif
 
 Check that we abort if --patch and --extract both are used at once
   $ hg amend --patch --extract