changeset 14485 | 610873cf064a |
parent 12681 | bc13e17067d9 |
child 16491 | bfe89d65d651 |
--- a/tests/test-update-branches.t Tue May 31 15:55:23 2011 -0500 +++ b/tests/test-update-branches.t Tue May 31 11:52:22 2011 -0700 @@ -77,7 +77,7 @@ parent=5 $ norevtest 'none clean same' clean 2 - abort: crosses branches (merge branches or use --check to force update) + abort: crosses branches (merge branches or update --check to force update) parent=2