Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update output to match b1339234080e stable
authorMartin Geisler <mg@lazybytes.net>
Mon, 01 Mar 2010 22:44:02 +0100
branchstable
changeset 10561 705386be4075
parent 10560 9134725caf1d
child 10563 bb4561401c84
tests: update output to match b1339234080e
tests/test-globalopts.out file | annotate | diff | comparison | revisions
tests/test-help.out file | annotate | diff | comparison | revisions 
--- 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
--- a/tests/test-help.out	Mon Mar 01 14:15:55 2010 +0100
+++ b/tests/test-help.out	Mon Mar 01 22:44:02 2010 +0100
@@ -77,7 +77,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
@@ -142,7 +142,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
@@ -563,7 +563,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
Mercurial