Mercurial > evolve
comparison tests/test-evolve-issue5967.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 | e8660b28bfee |
| children | 61d2f1cf90f0 |
comparison
equal
deleted
inserted
replaced
| 5665:dd9dba7c1d00 | 5666:e5d91fd1f319 |
|---|---|
| 41 atop:[2] apricot | 41 atop:[2] apricot |
| 42 merging a | 42 merging a |
| 43 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 43 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 44 unresolved merge conflicts | 44 unresolved merge conflicts |
| 45 (see 'hg help evolve.interrupted') | 45 (see 'hg help evolve.interrupted') |
| 46 [1] | 46 [240] |
| 47 | 47 |
| 48 $ echo apricot > a | 48 $ echo apricot > a |
| 49 $ hg resolve --mark a | 49 $ hg resolve --mark a |
| 50 (no more unresolved files) | 50 (no more unresolved files) |
| 51 continue: hg evolve --continue | 51 continue: hg evolve --continue |