--- a/tests/test-help.out Mon Mar 01 14:15:55 2010 +0100
+++ b/tests/test-help.out Mon Mar 01 22:44:02 2010 +0100
@@ -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 retry file merges from a merge or update
+ resolve various operations to help finish a merge
revert restore individual files or directories to an earlier state
rollback roll back the last transaction
root print the root (top) of the current working directory
@@ -142,7 +142,7 @@
recover roll back an interrupted transaction
remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove
- resolve retry file merges from a merge or update
+ resolve various operations to help finish a merge
revert restore individual files or directories to an earlier state
rollback roll back the last transaction
root print the root (top) of the current working directory
@@ -563,7 +563,7 @@
recover roll back an interrupted transaction
remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove
- resolve retry file merges from a merge or update
+ resolve various operations to help finish a merge
revert restore individual files or directories to an earlier state
rollback roll back the last transaction
root print the root (top) of the current working directory