tests: update to match "hg help resolve" output from 53fdc0989047

tests/test-globalopts.out

@@ -184,7 +184,7 b' list of commands:'
  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 b' list of commands:'
  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

tests/test-help.out

@@ -77,7 +77,7 b' list of commands:'
  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 b' use "hg -v help" to show aliases and glo'
  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 b' list of commands:'
  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