# HG changeset patch # User Martin Geisler # Date 2010-03-01 21:44:02 # Node ID 705386be4075f421e300187f86531d97e3193fc0 # Parent 9134725caf1dad2e67ebf30cf006a93be1f4a08b tests: update output to match b1339234080e diff --git a/tests/test-globalopts.out b/tests/test-globalopts.out --- a/tests/test-globalopts.out +++ b/tests/test-globalopts.out @@ -184,7 +184,7 @@ 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 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 @@ -253,7 +253,7 @@ 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 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 diff --git a/tests/test-help.out b/tests/test-help.out --- a/tests/test-help.out +++ b/tests/test-help.out @@ -77,7 +77,7 @@ 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 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 @@ 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 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 @@ 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 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