changeset 2552 | bb403d427974 |
parent 2283 | e506c14382fd |
child 2822 | 30f59f4a327e |
child 2955 | 9d1c3529ebbc |
--- a/tests/test-up-local-change.out +++ b/tests/test-up-local-change.out @@ -43,7 +43,7 @@ user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1 -abort: there is nothing to merge, just use 'hg update' +abort: there is nothing to merge, just use 'hg update' or look at 'hg heads' failed changeset: 0:33aaa84a386b user: test