Mercurial > hg
comparison tests/test-globalopts.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 | 0750f11152fe |
children | f60730693efc |
comparison
equal
deleted
inserted
replaced
6517:fcfb6a0a0a84 | 6518:92ccccb55ba3 |
---|---|
181 pull pull changes from the specified source | 181 pull pull changes from the specified source |
182 push push changes to the specified destination | 182 push push changes to the specified destination |
183 recover roll back an interrupted transaction | 183 recover roll back an interrupted transaction |
184 remove remove the specified files on the next commit | 184 remove remove the specified files on the next commit |
185 rename rename files; equivalent of copy + remove | 185 rename rename files; equivalent of copy + remove |
186 resolve resolve file merges from a branch merge or update | |
186 revert restore individual files or dirs to an earlier state | 187 revert restore individual files or dirs to an earlier state |
187 rollback roll back the last transaction | 188 rollback roll back the last transaction |
188 root print the root (top) of the current working dir | 189 root print the root (top) of the current working dir |
189 serve export the repository via HTTP | 190 serve export the repository via HTTP |
190 showconfig show combined config settings from all hgrc files | 191 showconfig show combined config settings from all hgrc files |
234 pull pull changes from the specified source | 235 pull pull changes from the specified source |
235 push push changes to the specified destination | 236 push push changes to the specified destination |
236 recover roll back an interrupted transaction | 237 recover roll back an interrupted transaction |
237 remove remove the specified files on the next commit | 238 remove remove the specified files on the next commit |
238 rename rename files; equivalent of copy + remove | 239 rename rename files; equivalent of copy + remove |
240 resolve resolve file merges from a branch merge or update | |
239 revert restore individual files or dirs to an earlier state | 241 revert restore individual files or dirs to an earlier state |
240 rollback roll back the last transaction | 242 rollback roll back the last transaction |
241 root print the root (top) of the current working dir | 243 root print the root (top) of the current working dir |
242 serve export the repository via HTTP | 244 serve export the repository via HTTP |
243 showconfig show combined config settings from all hgrc files | 245 showconfig show combined config settings from all hgrc files |