Mercurial > hg
comparison tests/test-help.t @ 23404:b913c394386f
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 27 Nov 2014 12:25:01 -0600 |
parents | 4165cfd67519 3bd577a3283e |
children | 6006cad5e7a9 |
comparison
equal
deleted
inserted
replaced
23399:fd5247a88e63 | 23404:b913c394386f |
---|---|
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 forget forget the specified files on the next commit | 14 forget forget the specified files on the next commit |
15 init create a new repository in the given directory | 15 init create a new repository in the given directory |
16 log show revision history of entire repository or files | 16 log show revision history of entire repository or files |
17 merge merge working directory with another revision | 17 merge merge another revision into working directory |
18 pull pull changes from the specified source | 18 pull pull changes from the specified source |
19 push push changes to the specified destination | 19 push push changes to the specified destination |
20 remove remove the specified files on the next commit | 20 remove remove the specified files on the next commit |
21 serve start stand-alone webserver | 21 serve start stand-alone webserver |
22 status show changed files in the working directory | 22 status show changed files in the working directory |
33 diff diff repository (or selected files) | 33 diff diff repository (or selected files) |
34 export dump the header and diffs for one or more changesets | 34 export dump the header and diffs for one or more changesets |
35 forget forget the specified files on the next commit | 35 forget forget the specified files on the next commit |
36 init create a new repository in the given directory | 36 init create a new repository in the given directory |
37 log show revision history of entire repository or files | 37 log show revision history of entire repository or files |
38 merge merge working directory with another revision | 38 merge merge another revision into working directory |
39 pull pull changes from the specified source | 39 pull pull changes from the specified source |
40 push push changes to the specified destination | 40 push push changes to the specified destination |
41 remove remove the specified files on the next commit | 41 remove remove the specified files on the next commit |
42 serve start stand-alone webserver | 42 serve start stand-alone webserver |
43 status show changed files in the working directory | 43 status show changed files in the working directory |
76 import import an ordered set of patches | 76 import import an ordered set of patches |
77 incoming show new changesets found in source | 77 incoming show new changesets found in source |
78 init create a new repository in the given directory | 78 init create a new repository in the given directory |
79 log show revision history of entire repository or files | 79 log show revision history of entire repository or files |
80 manifest output the current or given revision of the project manifest | 80 manifest output the current or given revision of the project manifest |
81 merge merge working directory with another revision | 81 merge merge another revision into working directory |
82 outgoing show changesets not found in the destination | 82 outgoing show changesets not found in the destination |
83 paths show aliases for remote repositories | 83 paths show aliases for remote repositories |
84 phase set or show the current phase name | 84 phase set or show the current phase name |
85 pull pull changes from the specified source | 85 pull pull changes from the specified source |
86 push push changes to the specified destination | 86 push push changes to the specified destination |
151 import import an ordered set of patches | 151 import import an ordered set of patches |
152 incoming show new changesets found in source | 152 incoming show new changesets found in source |
153 init create a new repository in the given directory | 153 init create a new repository in the given directory |
154 log show revision history of entire repository or files | 154 log show revision history of entire repository or files |
155 manifest output the current or given revision of the project manifest | 155 manifest output the current or given revision of the project manifest |
156 merge merge working directory with another revision | 156 merge merge another revision into working directory |
157 outgoing show changesets not found in the destination | 157 outgoing show changesets not found in the destination |
158 paths show aliases for remote repositories | 158 paths show aliases for remote repositories |
159 phase set or show the current phase name | 159 phase set or show the current phase name |
160 pull pull changes from the specified source | 160 pull pull changes from the specified source |
161 push push changes to the specified destination | 161 push push changes to the specified destination |
291 diff diff repository (or selected files) | 291 diff diff repository (or selected files) |
292 export dump the header and diffs for one or more changesets | 292 export dump the header and diffs for one or more changesets |
293 forget forget the specified files on the next commit | 293 forget forget the specified files on the next commit |
294 init create a new repository in the given directory | 294 init create a new repository in the given directory |
295 log, history show revision history of entire repository or files | 295 log, history show revision history of entire repository or files |
296 merge merge working directory with another revision | 296 merge merge another revision into working directory |
297 pull pull changes from the specified source | 297 pull pull changes from the specified source |
298 push push changes to the specified destination | 298 push push changes to the specified destination |
299 remove, rm remove the specified files on the next commit | 299 remove, rm remove the specified files on the next commit |
300 serve start stand-alone webserver | 300 serve start stand-alone webserver |
301 status, st show changed files in the working directory | 301 status, st show changed files in the working directory |
598 diff diff repository (or selected files) | 598 diff diff repository (or selected files) |
599 export dump the header and diffs for one or more changesets | 599 export dump the header and diffs for one or more changesets |
600 forget forget the specified files on the next commit | 600 forget forget the specified files on the next commit |
601 init create a new repository in the given directory | 601 init create a new repository in the given directory |
602 log show revision history of entire repository or files | 602 log show revision history of entire repository or files |
603 merge merge working directory with another revision | 603 merge merge another revision into working directory |
604 pull pull changes from the specified source | 604 pull pull changes from the specified source |
605 push push changes to the specified destination | 605 push push changes to the specified destination |
606 remove remove the specified files on the next commit | 606 remove remove the specified files on the next commit |
607 serve start stand-alone webserver | 607 serve start stand-alone webserver |
608 status show changed files in the working directory | 608 status show changed files in the working directory |
693 import import an ordered set of patches | 693 import import an ordered set of patches |
694 incoming show new changesets found in source | 694 incoming show new changesets found in source |
695 init create a new repository in the given directory | 695 init create a new repository in the given directory |
696 log show revision history of entire repository or files | 696 log show revision history of entire repository or files |
697 manifest output the current or given revision of the project manifest | 697 manifest output the current or given revision of the project manifest |
698 merge merge working directory with another revision | 698 merge merge another revision into working directory |
699 outgoing show changesets not found in the destination | 699 outgoing show changesets not found in the destination |
700 paths show aliases for remote repositories | 700 paths show aliases for remote repositories |
701 phase set or show the current phase name | 701 phase set or show the current phase name |
702 pull pull changes from the specified source | 702 pull pull changes from the specified source |
703 push push changes to the specified destination | 703 push push changes to the specified destination |
1361 <tr><td> | 1361 <tr><td> |
1362 <a href="/help/merge"> | 1362 <a href="/help/merge"> |
1363 merge | 1363 merge |
1364 </a> | 1364 </a> |
1365 </td><td> | 1365 </td><td> |
1366 merge working directory with another revision | 1366 merge another revision into working directory |
1367 </td></tr> | 1367 </td></tr> |
1368 <tr><td> | 1368 <tr><td> |
1369 <a href="/help/pull"> | 1369 <a href="/help/pull"> |
1370 pull | 1370 pull |
1371 </a> | 1371 </a> |