Mercurial > evolve
comparison tests/test-unstability-resolution-result.t @ 5666:e5d91fd1f319
tests: update with more detailed exit codes
CORE-TEST-OUTPUT-UPDATE: 21733e8c924f
CORE-TEST-OUTPUT-UPDATE: 8d72e29ad1e0
CORE-TEST-OUTPUT-UPDATE: e0dbfbd4062c
CORE-TEST-OUTPUT-UPDATE: ebee234d952a
CORE-TEST-OUTPUT-UPDATE: 527ce85c2e60
CORE-TEST-OUTPUT-UPDATE: 3175b0e0058b
CORE-TEST-OUTPUT-UPDATE: f96fa4de5055
CORE-TEST-OUTPUT-UPDATE: 96ca817ec192
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 19 Nov 2020 08:28:45 -0800 |
| parents | 98e2613d797d |
| children | ed7ff9c0a940 |
comparison
equal
deleted
inserted
replaced
| 5665:dd9dba7c1d00 | 5666:e5d91fd1f319 |
|---|---|
| 90 atop:[5] changea | 90 atop:[5] changea |
| 91 merging a | 91 merging a |
| 92 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 92 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 93 unresolved merge conflicts | 93 unresolved merge conflicts |
| 94 (see 'hg help evolve.interrupted') | 94 (see 'hg help evolve.interrupted') |
| 95 [1] | 95 [240] |
| 96 $ hg revert -r "orphan()" a | 96 $ hg revert -r "orphan()" a |
| 97 $ hg diff | 97 $ hg diff |
| 98 diff -r 66719795a494 a | 98 diff -r 66719795a494 a |
| 99 --- a/a Thu Jan 01 00:00:00 1970 +0000 | 99 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
| 100 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | 100 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |