Mercurial > hg-stable
comparison tests/test-keyword.out @ 9468:b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Includes the change to the message itself, along with several test
output files that also had to change.
| author | Stuart W Marks <smarks@smarks.org> |
|---|---|
| date | Thu, 17 Sep 2009 22:39:38 -0700 |
| parents | 4483af166c61 |
| children | fe1ecd15c6bd |
comparison
equal
deleted
inserted
replaced
| 9467:4c041f1ee1b4 | 9468:b2310903c462 |
|---|---|
| 398 created new head | 398 created new head |
| 399 merging m | 399 merging m |
| 400 warning: conflicts during merge. | 400 warning: conflicts during merge. |
| 401 merging m failed! | 401 merging m failed! |
| 402 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 402 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 403 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | 403 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 404 % keyword stays outside conflict zone | 404 % keyword stays outside conflict zone |
| 405 $Id$ | 405 $Id$ |
| 406 <<<<<<< local | 406 <<<<<<< local |
| 407 bar | 407 bar |
| 408 ======= | 408 ======= |