Mercurial > hg
diff tests/test-globalopts.out @ 11840:3f838abf2b96 stable
tests: update to match "hg help resolve" output from 53fdc0989047
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Fri, 13 Aug 2010 15:17:55 +0200 |
parents | 2f09b13e914d |
children | a4fbbe0fbc38 |
line wrap: on
line diff
--- a/tests/test-globalopts.out Thu Aug 12 22:48:22 2010 +0200 +++ b/tests/test-globalopts.out Fri Aug 13 15:17:55 2010 +0200 @@ -184,7 +184,7 @@ recover roll back an interrupted transaction remove remove the specified files on the next commit rename rename files; equivalent of copy + remove - resolve various operations to help finish a merge + resolve redo merges or set/view the merge status of files revert restore individual files or directories to an earlier state rollback roll back the last transaction (dangerous) root print the root (top) of the current working directory @@ -256,7 +256,7 @@ recover roll back an interrupted transaction remove remove the specified files on the next commit rename rename files; equivalent of copy + remove - resolve various operations to help finish a merge + resolve redo merges or set/view the merge status of files revert restore individual files or directories to an earlier state rollback roll back the last transaction (dangerous) root print the root (top) of the current working directory