# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1281705475 -7200
# Node ID 3f838abf2b9616be6f7813fc8a71dc2cfcb36e8c
# Parent  53fdc0989047af5a368dcb5f4daf0b5450da000e
tests: update to match "hg help resolve" output from 53fdc0989047

diff -r 53fdc0989047 -r 3f838abf2b96 tests/test-globalopts.out
--- 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
diff -r 53fdc0989047 -r 3f838abf2b96 tests/test-help.out
--- 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