Mercurial > evolve
comparison tests/test-evolve-content-divergence.t @ 3853:796334340cad
evolve: make one missed error to align other error messages
Previous patches missed this error to change it to the new format. Let's align
this with all other messages raised by `hg evolve` command.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Fri, 15 Jun 2018 00:50:17 +0530 |
| parents | 629558d09898 |
| children | 9cf45b94f977 |
comparison
equal
deleted
inserted
replaced
| 3852:629558d09898 | 3853:796334340cad |
|---|---|
| 666 with: [23] added z | 666 with: [23] added z |
| 667 base: [22] added z | 667 base: [22] added z |
| 668 rebasing "other" content-divergent changeset 3f7a1f693080 on 7bbcf24ddecf | 668 rebasing "other" content-divergent changeset 3f7a1f693080 on 7bbcf24ddecf |
| 669 merging y | 669 merging y |
| 670 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') | 670 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
| 671 abort: unresolved merge conflicts (see hg help resolve) | 671 fix conflicts and see `hg help evolve.interrupted` |
| 672 [255] | 672 [1] |
| 673 | 673 |
| 674 $ hg diff | 674 $ hg diff |
| 675 diff -r 7bbcf24ddecf y | 675 diff -r 7bbcf24ddecf y |
| 676 --- a/y Thu Jan 01 00:00:00 1970 +0000 | 676 --- a/y Thu Jan 01 00:00:00 1970 +0000 |
| 677 +++ b/y Thu Jan 01 00:00:00 1970 +0000 | 677 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |