Mercurial > hg
comparison tests/test-commit-unresolved.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 |
|---|---|
| 4 % Merging a conflict araises | 4 % Merging a conflict araises |
| 5 merging A | 5 merging A |
| 6 warning: conflicts during merge. | 6 warning: conflicts during merge. |
| 7 merging A failed! | 7 merging A failed! |
| 8 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | 8 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 9 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | 9 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 10 | 10 |
| 11 % Correct the conflict without marking the file as resolved | 11 % Correct the conflict without marking the file as resolved |
| 12 abort: unresolved merge conflicts (see hg resolve) | 12 abort: unresolved merge conflicts (see hg resolve) |
| 13 | 13 |
| 14 % Mark the conflict as resolved and commit | 14 % Mark the conflict as resolved and commit |