author | Thomas Arendsen Hein <thomas@intevation.de> |
Mon, 03 Jul 2006 19:28:31 +0200 | |
changeset 2552 | bb403d427974 |
parent 2551 | 764a54eb8c5a |
child 2553 | 5b426676f616 |
--- 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