changeset 2915 | 013921c753bd |
parent 2830 | 49988d9f0758 |
child 2956 | 6dddcba7596a |
--- a/tests/test-up-local-change.out Tue Aug 15 09:37:58 2006 -0700 +++ b/tests/test-up-local-change.out Tue Aug 15 11:38:07 2006 -0700 @@ -43,7 +43,7 @@ date: Mon Jan 12 13:46:40 1970 +0000 summary: 1 -abort: there is nothing to merge, just use 'hg update' or look at 'hg heads' +abort: there is nothing to merge - use "hg update" instead failed changeset: 0:33aaa84a386b user: test