Mercurial > hg
comparison tests/test-up-local-change.out @ 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 | e506c14382fd |
| children | 30f59f4a327e 9d1c3529ebbc |
comparison
equal
deleted
inserted
replaced
| 2551:764a54eb8c5a | 2552:bb403d427974 |
|---|---|
| 41 changeset: 0:33aaa84a386b | 41 changeset: 0:33aaa84a386b |
| 42 user: test | 42 user: test |
| 43 date: Mon Jan 12 13:46:40 1970 +0000 | 43 date: Mon Jan 12 13:46:40 1970 +0000 |
| 44 summary: 1 | 44 summary: 1 |
| 45 | 45 |
| 46 abort: there is nothing to merge, just use 'hg update' | 46 abort: there is nothing to merge, just use 'hg update' or look at 'hg heads' |
| 47 failed | 47 failed |
| 48 changeset: 0:33aaa84a386b | 48 changeset: 0:33aaa84a386b |
| 49 user: test | 49 user: test |
| 50 date: Mon Jan 12 13:46:40 1970 +0000 | 50 date: Mon Jan 12 13:46:40 1970 +0000 |
| 51 summary: 1 | 51 summary: 1 |