Mercurial > hg-stable
diff 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 |
line wrap: on
line diff
--- a/tests/test-help.out Fri Dec 19 16:48:32 2008 -0600 +++ b/tests/test-help.out Fri Dec 19 20:58:33 2008 -0600 @@ -74,7 +74,7 @@ recover roll back an interrupted transaction remove remove the specified files on the next commit rename rename files; equivalent of copy + remove - resolve resolve file merges from a branch merge or update + resolve retry file merges from a merge or update revert restore individual files or dirs to an earlier state rollback roll back the last transaction root print the root (top) of the current working dir @@ -133,7 +133,7 @@ recover roll back an interrupted transaction remove remove the specified files on the next commit rename rename files; equivalent of copy + remove - resolve resolve file merges from a branch merge or update + resolve retry file merges from a merge or update revert restore individual files or dirs to an earlier state rollback roll back the last transaction root print the root (top) of the current working dir