# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1281705495 -7200
# Node ID d59a623cc4c931af084b8696cc6ed896d583701e
# Parent  8c034517b406ea1441715028134841d4caf2b00e# Parent  3f838abf2b9616be6f7813fc8a71dc2cfcb36e8c
Merge with stable

diff -r 8c034517b406 -r d59a623cc4c9 tests/test-globalopts.out
--- a/tests/test-globalopts.out	Fri Aug 13 11:12:37 2010 +0200
+++ b/tests/test-globalopts.out	Fri Aug 13 15:18:15 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 8c034517b406 -r d59a623cc4c9 tests/test-help.out
--- a/tests/test-help.out	Fri Aug 13 11:12:37 2010 +0200
+++ b/tests/test-help.out	Fri Aug 13 15:18:15 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