comparison tests/test-strict.out @ 4014:509342f95564

various doc fixes - update can no longer be used to merge - short summary start with lowercase - add merge to short help list - fix tests
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 29 Dec 2006 06:37:43 +0100
parents 63c3a1921a67
children bc6f5a1d8b7b
comparison
equal deleted inserted replaced
4013:54fa628b8c78 4014:509342f95564
11 commit commit the specified files or all outstanding changes 11 commit commit the specified files or all outstanding changes
12 diff diff repository (or selected files) 12 diff diff repository (or selected files)
13 export dump the header and diffs for one or more changesets 13 export dump the header and diffs for one or more changesets
14 init create a new repository in the given directory 14 init create a new repository in the given directory
15 log show revision history of entire repository or files 15 log show revision history of entire repository or files
16 merge merge working directory with another revision
16 parents show the parents of the working dir or revision 17 parents show the parents of the working dir or revision
17 pull pull changes from the specified source 18 pull pull changes from the specified source
18 push push changes to the specified destination 19 push push changes to the specified destination
19 remove remove the specified files on the next commit 20 remove remove the specified files on the next commit
20 revert revert files or dirs to their states as of some revision 21 revert revert files or dirs to their states as of some revision
21 serve export the repository via HTTP 22 serve export the repository via HTTP
22 status show changed files in the working directory 23 status show changed files in the working directory
23 update update or merge working directory 24 update update working directory
24 0: a 25 0: a
25 % should succeed - up is an alias, not an abbreviation 26 % should succeed - up is an alias, not an abbreviation
26 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 27 0 files updated, 0 files merged, 0 files removed, 0 files unresolved