Mercurial > hg > mercurial-crew-with-dirclash
comparison 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 |
comparison
equal
deleted
inserted
replaced
4013:54fa628b8c78 | 4014:509342f95564 |
---|---|
139 incoming show new changesets found in source | 139 incoming show new changesets found in source |
140 init create a new repository in the given directory | 140 init create a new repository in the given directory |
141 locate locate files matching specific patterns | 141 locate locate files matching specific patterns |
142 log show revision history of entire repository or files | 142 log show revision history of entire repository or files |
143 manifest output the current or given revision of the project manifest | 143 manifest output the current or given revision of the project manifest |
144 merge Merge working directory with another revision | 144 merge merge working directory with another revision |
145 outgoing show changesets not found in destination | 145 outgoing show changesets not found in destination |
146 parents show the parents of the working dir or revision | 146 parents show the parents of the working dir or revision |
147 paths show definition of symbolic path names | 147 paths show definition of symbolic path names |
148 pull pull changes from the specified source | 148 pull pull changes from the specified source |
149 push push changes to the specified destination | 149 push push changes to the specified destination |
158 status show changed files in the working directory | 158 status show changed files in the working directory |
159 tag add a tag for the current or given revision | 159 tag add a tag for the current or given revision |
160 tags list repository tags | 160 tags list repository tags |
161 tip show the tip revision | 161 tip show the tip revision |
162 unbundle apply a changegroup file | 162 unbundle apply a changegroup file |
163 update update or merge working directory | 163 update update working directory |
164 verify verify the integrity of the repository | 164 verify verify the integrity of the repository |
165 version output version and copyright information | 165 version output version and copyright information |
166 Mercurial Distributed SCM | 166 Mercurial Distributed SCM |
167 | 167 |
168 list of commands (use "hg help -v" to show aliases and global options): | 168 list of commands (use "hg help -v" to show aliases and global options): |
189 incoming show new changesets found in source | 189 incoming show new changesets found in source |
190 init create a new repository in the given directory | 190 init create a new repository in the given directory |
191 locate locate files matching specific patterns | 191 locate locate files matching specific patterns |
192 log show revision history of entire repository or files | 192 log show revision history of entire repository or files |
193 manifest output the current or given revision of the project manifest | 193 manifest output the current or given revision of the project manifest |
194 merge Merge working directory with another revision | 194 merge merge working directory with another revision |
195 outgoing show changesets not found in destination | 195 outgoing show changesets not found in destination |
196 parents show the parents of the working dir or revision | 196 parents show the parents of the working dir or revision |
197 paths show definition of symbolic path names | 197 paths show definition of symbolic path names |
198 pull pull changes from the specified source | 198 pull pull changes from the specified source |
199 push push changes to the specified destination | 199 push push changes to the specified destination |
208 status show changed files in the working directory | 208 status show changed files in the working directory |
209 tag add a tag for the current or given revision | 209 tag add a tag for the current or given revision |
210 tags list repository tags | 210 tags list repository tags |
211 tip show the tip revision | 211 tip show the tip revision |
212 unbundle apply a changegroup file | 212 unbundle apply a changegroup file |
213 update update or merge working directory | 213 update update working directory |
214 verify verify the integrity of the repository | 214 verify verify the integrity of the repository |
215 version output version and copyright information | 215 version output version and copyright information |
216 %% not tested: --debugger | 216 %% not tested: --debugger |