Mercurial > evolve
comparison tests/test-evolve-phase.t @ 5714:b3d9e6c805d6 stable
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 | 6eb9f82b43ba |
| children | 61d2f1cf90f0 |
comparison
equal
deleted
inserted
replaced
| 5713:c3c870f3b98e | 5714:b3d9e6c805d6 |
|---|---|
| 85 atop:[3] b | 85 atop:[3] b |
| 86 merging a | 86 merging a |
| 87 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 87 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 88 unresolved merge conflicts | 88 unresolved merge conflicts |
| 89 (see 'hg help evolve.interrupted') | 89 (see 'hg help evolve.interrupted') |
| 90 [1] | 90 [240] |
| 91 | 91 |
| 92 $ hg diff | 92 $ hg diff |
| 93 diff -r 87495ea7c9ec a | 93 diff -r 87495ea7c9ec a |
| 94 --- a/a Thu Jan 01 00:00:00 1970 +0000 | 94 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
| 95 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | 95 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |