branch | stable |
changeset 13455 | 053c042118bc |
parent 13446 | 1e497df514e2 |
child 16913 | f2719b387380 |
--- a/tests/test-rename-after-merge.t Mon Feb 21 23:27:45 2011 +0100 +++ b/tests/test-rename-after-merge.t Mon Feb 21 20:58:54 2011 -0300 @@ -98,7 +98,7 @@ $ hg rollback repository tip rolled back to revision 2 (undo commit) - working directory now based on revision 2 and 1 + working directory now based on revisions 2 and 1 $ hg up -C . 2 files updated, 0 files merged, 2 files removed, 0 files unresolved