upstream/mercurial-mirror Commit - r11840:3f838abf

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

Martin Geisler -

r11840:3f838abf stable

parent child

tests/test-globalopts.out

0 +2 -2

              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
              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

0 +3 -3

              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
              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
              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

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages