Mercurial > evolve
comparison tests/test-stabilize-result.t @ 1755:6c78a5470583 stable
evolve: prefer "abort" over "abandon" in messages for consistency
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 28 Oct 2016 17:11:43 -0700 |
| parents | 9fd15f27c91c |
| children | a7dcfff8c4a9 |
comparison
equal
deleted
inserted
replaced
| 1754:c9ddc93eee67 | 1755:6c78a5470583 |
|---|---|
| 357 with: [21] More addition | 357 with: [21] More addition |
| 358 base: [15] More addition | 358 base: [15] More addition |
| 359 merging a | 359 merging a |
| 360 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 360 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 361 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 361 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 362 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 362 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abort |
| 363 abort: merge conflict between several amendments (this is not automated yet) | 363 abort: merge conflict between several amendments (this is not automated yet) |
| 364 (/!\ You can try: | 364 (/!\ You can try: |
| 365 /!\ * manual merge + resolve => new cset X | 365 /!\ * manual merge + resolve => new cset X |
| 366 /!\ * hg up to the parent of the amended changeset (which are named W and Z) | 366 /!\ * hg up to the parent of the amended changeset (which are named W and Z) |
| 367 /!\ * hg revert --all -r X | 367 /!\ * hg revert --all -r X |