Mercurial > hg
comparison tests/test-help.t @ 23400:3bd577a3283e stable
merge: be precise about what merged into what in short desc
author | anatoly techtonik <techtonik@gmail.com> |
---|---|
date | Wed, 26 Nov 2014 17:22:09 +0300 |
parents | d9e3f5055772 |
children | b913c394386f |
comparison
equal
deleted
inserted
replaced
23383:7f8d27e1f862 | 23400:3bd577a3283e |
---|---|
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 |
597 diff diff repository (or selected files) | 597 diff diff repository (or selected files) |
598 export dump the header and diffs for one or more changesets | 598 export dump the header and diffs for one or more changesets |
599 forget forget the specified files on the next commit | 599 forget forget the specified files on the next commit |
600 init create a new repository in the given directory | 600 init create a new repository in the given directory |
601 log show revision history of entire repository or files | 601 log show revision history of entire repository or files |
602 merge merge working directory with another revision | 602 merge merge another revision into working directory |
603 pull pull changes from the specified source | 603 pull pull changes from the specified source |
604 push push changes to the specified destination | 604 push push changes to the specified destination |
605 remove remove the specified files on the next commit | 605 remove remove the specified files on the next commit |
606 serve start stand-alone webserver | 606 serve start stand-alone webserver |
607 status show changed files in the working directory | 607 status show changed files in the working directory |
692 import import an ordered set of patches | 692 import import an ordered set of patches |
693 incoming show new changesets found in source | 693 incoming show new changesets found in source |
694 init create a new repository in the given directory | 694 init create a new repository in the given directory |
695 log show revision history of entire repository or files | 695 log show revision history of entire repository or files |
696 manifest output the current or given revision of the project manifest | 696 manifest output the current or given revision of the project manifest |
697 merge merge working directory with another revision | 697 merge merge another revision into working directory |
698 outgoing show changesets not found in the destination | 698 outgoing show changesets not found in the destination |
699 paths show aliases for remote repositories | 699 paths show aliases for remote repositories |
700 phase set or show the current phase name | 700 phase set or show the current phase name |
701 pull pull changes from the specified source | 701 pull pull changes from the specified source |
702 push push changes to the specified destination | 702 push push changes to the specified destination |
1360 <tr><td> | 1360 <tr><td> |
1361 <a href="/help/merge"> | 1361 <a href="/help/merge"> |
1362 merge | 1362 merge |
1363 </a> | 1363 </a> |
1364 </td><td> | 1364 </td><td> |
1365 merge working directory with another revision | 1365 merge another revision into working directory |
1366 </td></tr> | 1366 </td></tr> |
1367 <tr><td> | 1367 <tr><td> |
1368 <a href="/help/pull"> | 1368 <a href="/help/pull"> |
1369 pull | 1369 pull |
1370 </a> | 1370 </a> |