Mercurial > evolve
comparison tests/test-stabilize-result.t @ 947:9a6cc7e6f0dd stable
evolve: improve wording of a few of messages
| author | Angel Ezquerra <angel.ezquerra@gmail.com> |
|---|---|
| date | Tue, 29 Apr 2014 22:25:35 +0200 |
| parents | 561b3cdb4453 |
| children | cf4dcf49d998 |
comparison
equal
deleted
inserted
replaced
| 946:dedd5359340f | 947:9a6cc7e6f0dd |
|---|---|
| 317 merging a | 317 merging a |
| 318 warning: conflicts during merge. | 318 warning: conflicts during merge. |
| 319 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') | 319 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
| 320 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 320 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 321 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 321 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 322 abort: Merge conflict between several amendments, and this is not yet automated | 322 abort: merge conflict between several amendments (this is not automated yet) |
| 323 (/!\ You can try: | 323 (/!\ You can try: |
| 324 /!\ * manual merge + resolve => new cset X | 324 /!\ * manual merge + resolve => new cset X |
| 325 /!\ * hg up to the parent of the amended changeset (which are named W and Z) | 325 /!\ * hg up to the parent of the amended changeset (which are named W and Z) |
| 326 /!\ * hg revert --all -r X | 326 /!\ * hg revert --all -r X |
| 327 /!\ * hg ci -m "same message as the amended changeset" => new cset Y | 327 /!\ * hg ci -m "same message as the amended changeset" => new cset Y |