Mercurial Mercurial > mercurial / 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
changeset 7530 3773e510d433
parent 7387 7e9a15fa6c8f
child 7679 eb98218db768 
--- a/tests/test-globalopts.out	Fri Dec 19 16:48:32 2008 -0600
+++ b/tests/test-globalopts.out	Fri Dec 19 20:58:33 2008 -0600
@@ -183,7 +183,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
@@ -246,7 +246,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
mercurial