Mercurial Mercurial > hg-stable / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-globalopts.out
branchstable
changeset 10561 705386be4075
parent 10376 a2950e053614
child 10889 e25c450c351e 
--- a/tests/test-globalopts.out	Mon Mar 01 14:15:55 2010 +0100
+++ b/tests/test-globalopts.out	Mon Mar 01 22:44:02 2010 +0100
@@ -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      retry file merges from a merge or update
+ resolve      various operations to help finish a merge
  revert       restore individual files or directories to an earlier state
  rollback     roll back the last transaction
  root         print the root (top) of the current working directory
@@ -253,7 +253,7 @@
  recover      roll back an interrupted transaction
  remove       remove the specified files on the next commit
  rename       rename files; equivalent of copy + remove
- resolve      retry file merges from a merge or update
+ resolve      various operations to help finish a merge
  revert       restore individual files or directories to an earlier state
  rollback     roll back the last transaction
  root         print the root (top) of the current working directory
hg-stable