Mercurial > hg
comparison tests/test-help.out @ 7530:3773e510d433 1.1.1
resolve: clarify and simplify help
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 19 Dec 2008 20:58:33 -0600 |
| parents | 7e9a15fa6c8f |
| children | 9c6ae2e09e11 |
comparison
equal
deleted
inserted
replaced
| 7529:0a65a1dd7894 | 7530:3773e510d433 |
|---|---|
| 72 pull pull changes from the specified source | 72 pull pull changes from the specified source |
| 73 push push changes to the specified destination | 73 push push changes to the specified destination |
| 74 recover roll back an interrupted transaction | 74 recover roll back an interrupted transaction |
| 75 remove remove the specified files on the next commit | 75 remove remove the specified files on the next commit |
| 76 rename rename files; equivalent of copy + remove | 76 rename rename files; equivalent of copy + remove |
| 77 resolve resolve file merges from a branch merge or update | 77 resolve retry file merges from a merge or update |
| 78 revert restore individual files or dirs to an earlier state | 78 revert restore individual files or dirs to an earlier state |
| 79 rollback roll back the last transaction | 79 rollback roll back the last transaction |
| 80 root print the root (top) of the current working dir | 80 root print the root (top) of the current working dir |
| 81 serve export the repository via HTTP | 81 serve export the repository via HTTP |
| 82 showconfig show combined config settings from all hgrc files | 82 showconfig show combined config settings from all hgrc files |
| 131 pull pull changes from the specified source | 131 pull pull changes from the specified source |
| 132 push push changes to the specified destination | 132 push push changes to the specified destination |
| 133 recover roll back an interrupted transaction | 133 recover roll back an interrupted transaction |
| 134 remove remove the specified files on the next commit | 134 remove remove the specified files on the next commit |
| 135 rename rename files; equivalent of copy + remove | 135 rename rename files; equivalent of copy + remove |
| 136 resolve resolve file merges from a branch merge or update | 136 resolve retry file merges from a merge or update |
| 137 revert restore individual files or dirs to an earlier state | 137 revert restore individual files or dirs to an earlier state |
| 138 rollback roll back the last transaction | 138 rollback roll back the last transaction |
| 139 root print the root (top) of the current working dir | 139 root print the root (top) of the current working dir |
| 140 serve export the repository via HTTP | 140 serve export the repository via HTTP |
| 141 showconfig show combined config settings from all hgrc files | 141 showconfig show combined config settings from all hgrc files |