Mercurial > hg
comparison tests/test-conflict.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 | 9fe7e6acf525 |
| children |
comparison
equal
deleted
inserted
replaced
| 9467:4c041f1ee1b4 | 9468:b2310903c462 |
|---|---|
| 2 created new head | 2 created new head |
| 3 merging a | 3 merging a |
| 4 warning: conflicts during merge. | 4 warning: conflicts during merge. |
| 5 merging a failed! | 5 merging a failed! |
| 6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 7 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | 7 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 8 e7fe8eb3e180+0d24b7662d3e+ tip | 8 e7fe8eb3e180+0d24b7662d3e+ tip |
| 9 <<<<<<< local | 9 <<<<<<< local |
| 10 something else | 10 something else |
| 11 ======= | 11 ======= |
| 12 something | 12 something |