Mercurial > hg
changeset 2552:bb403d427974
Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 03 Jul 2006 19:28:31 +0200 |
| parents | 764a54eb8c5a |
| children | 5b426676f616 |
| files | tests/test-up-local-change.out |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-up-local-change.out Mon Jul 03 10:19:09 2006 -0700 +++ b/tests/test-up-local-change.out Mon Jul 03 19:28:31 2006 +0200 @@ -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' +abort: there is nothing to merge, just use 'hg update' or look at 'hg heads' failed changeset: 0:33aaa84a386b user: test