Mercurial > hg
comparison tests/test-help.out @ 6518:92ccccb55ba3
resolve: new command
- add basic resolve command functionality
- point failed update and merge at resolve
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 11 Apr 2008 12:52:56 -0500 |
| parents | af2edc9c5bb9 |
| children | 034f444902d9 |
comparison
equal
deleted
inserted
replaced
| 6517:fcfb6a0a0a84 | 6518:92ccccb55ba3 |
|---|---|
| 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 revert restore individual files or dirs to an earlier state | 78 revert restore individual files or dirs to an earlier state |
| 78 rollback roll back the last transaction | 79 rollback roll back the last transaction |
| 79 root print the root (top) of the current working dir | 80 root print the root (top) of the current working dir |
| 80 serve export the repository via HTTP | 81 serve export the repository via HTTP |
| 81 showconfig show combined config settings from all hgrc files | 82 showconfig show combined config settings from all hgrc files |
| 121 pull pull changes from the specified source | 122 pull pull changes from the specified source |
| 122 push push changes to the specified destination | 123 push push changes to the specified destination |
| 123 recover roll back an interrupted transaction | 124 recover roll back an interrupted transaction |
| 124 remove remove the specified files on the next commit | 125 remove remove the specified files on the next commit |
| 125 rename rename files; equivalent of copy + remove | 126 rename rename files; equivalent of copy + remove |
| 127 resolve resolve file merges from a branch merge or update | |
| 126 revert restore individual files or dirs to an earlier state | 128 revert restore individual files or dirs to an earlier state |
| 127 rollback roll back the last transaction | 129 rollback roll back the last transaction |
| 128 root print the root (top) of the current working dir | 130 root print the root (top) of the current working dir |
| 129 serve export the repository via HTTP | 131 serve export the repository via HTTP |
| 130 showconfig show combined config settings from all hgrc files | 132 showconfig show combined config settings from all hgrc files |