Mercurial > hg
diff tests/test-globalopts.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 | 3c82ab166eea |
| children | f9bbcebcacea |
line wrap: on
line diff
--- a/tests/test-globalopts.out Fri Dec 29 06:08:46 2006 +0100 +++ b/tests/test-globalopts.out Fri Dec 29 06:37:43 2006 +0100 @@ -141,7 +141,7 @@ locate locate files matching specific patterns log show revision history of entire repository or files manifest output the current or given revision of the project manifest - merge Merge working directory with another revision + merge merge working directory with another revision outgoing show changesets not found in destination parents show the parents of the working dir or revision paths show definition of symbolic path names @@ -160,7 +160,7 @@ tags list repository tags tip show the tip revision unbundle apply a changegroup file - update update or merge working directory + update update working directory verify verify the integrity of the repository version output version and copyright information Mercurial Distributed SCM @@ -191,7 +191,7 @@ locate locate files matching specific patterns log show revision history of entire repository or files manifest output the current or given revision of the project manifest - merge Merge working directory with another revision + merge merge working directory with another revision outgoing show changesets not found in destination parents show the parents of the working dir or revision paths show definition of symbolic path names @@ -210,7 +210,7 @@ tags list repository tags tip show the tip revision unbundle apply a changegroup file - update update or merge working directory + update update working directory verify verify the integrity of the repository version output version and copyright information %% not tested: --debugger