--- a/tests/test-help.out Wed Jun 10 15:10:21 2009 +0200
+++ b/tests/test-help.out Tue Jun 09 21:51:34 2009 -0400
@@ -3,7 +3,7 @@
basic commands:
add add the specified files on the next commit
- annotate show changeset information per file line
+ annotate show changeset information by line for each file
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff repository (or selected files)
@@ -21,7 +21,7 @@
use "hg help" for the full list of commands or "hg -v" for details
add add the specified files on the next commit
- annotate show changeset information per file line
+ annotate show changeset information by line for each file
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff repository (or selected files)
@@ -42,8 +42,8 @@
add add the specified files on the next commit
addremove add all new files, delete all missing files
- annotate show changeset information per file line
- archive create unversioned archive of a repository revision
+ annotate show changeset information by line for each file
+ archive create an unversioned archive of a repository revision
backout reverse effect of earlier changeset
bisect subdivision search of changesets
branch set or show the current branch name
@@ -103,8 +103,8 @@
use "hg -v help" to show aliases and global options
add add the specified files on the next commit
addremove add all new files, delete all missing files
- annotate show changeset information per file line
- archive create unversioned archive of a repository revision
+ annotate show changeset information by line for each file
+ archive create an unversioned archive of a repository revision
backout reverse effect of earlier changeset
bisect subdivision search of changesets
branch set or show the current branch name
@@ -248,10 +248,10 @@
Show status of files in the repository. If names are given, only
files that match are shown. Files that are clean or ignored or
- source of a copy/move operation, are not listed unless -c/--clean,
- -i/--ignored, -C/--copies or -A/--all is given. Unless options
- described with "show only ..." are given, the options -mardu are
- used.
+ the source of a copy/move operation, are not listed unless
+ -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
+ Unless options described with "show only ..." are given, the
+ options -mardu are used.
Option -q/--quiet hides untracked (unknown and ignored) files
unless explicitly requested with -u/--unknown or -i/--ignored.
@@ -262,7 +262,8 @@
to one merge parent.
If one revision is given, it is used as the base revision.
- If two revisions are given, the difference between them is shown.
+ If two revisions are given, the differences between them are
+ shown.
The codes used to show the status of files are:
M = modified
@@ -272,7 +273,7 @@
! = missing (deleted by non-hg command, but still tracked)
? = not tracked
I = ignored
- = the previous added file was copied from here
+ = origin of the previous file listed as A (added)
options:
@@ -301,7 +302,7 @@
basic commands:
add add the specified files on the next commit
- annotate show changeset information per file line
+ annotate show changeset information by line for each file
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff repository (or selected files)
@@ -324,7 +325,7 @@
basic commands:
add add the specified files on the next commit
- annotate show changeset information per file line
+ annotate show changeset information by line for each file
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff repository (or selected files)