Mercurial > hg-stable

changeset 11840:3f838abf2b96 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 53fdc0989047
children d59a623cc4c9 71dab6955be0
files tests/test-globalopts.out tests/test-help.out
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
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
--- a/tests/test-help.out	Thu Aug 12 22:48:22 2010 +0200
+++ b/tests/test-help.out	Fri Aug 13 15:17:55 2010 +0200
@@ -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      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
@@ -145,7 +145,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
@@ -601,7 +601,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