Mercurial > evolve
comparison tests/test-stabilize-conflict.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 | b2de5825e5ca |
| children | 8e4f6354b316 a1dad44fe3da |
comparison
equal
deleted
inserted
replaced
| 5665:dd9dba7c1d00 | 5666:e5d91fd1f319 |
|---|---|
| 128 atop:[5] babar count up to ten | 128 atop:[5] babar count up to ten |
| 129 merging babar | 129 merging babar |
| 130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') | 130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') |
| 131 unresolved merge conflicts | 131 unresolved merge conflicts |
| 132 (see 'hg help evolve.interrupted') | 132 (see 'hg help evolve.interrupted') |
| 133 [1] | 133 [240] |
| 134 $ hg resolve -l | 134 $ hg resolve -l |
| 135 U babar | 135 U babar |
| 136 $ hg log -G | 136 $ hg log -G |
| 137 @ changeset: 5:e04690b09bc6 | 137 @ changeset: 5:e04690b09bc6 |
| 138 | tag: tip | 138 | tag: tip |
| 221 output file babar appears unchanged | 221 output file babar appears unchanged |
| 222 was merge successful (yn)? n | 222 was merge successful (yn)? n |
| 223 merging babar failed! | 223 merging babar failed! |
| 224 unresolved merge conflicts | 224 unresolved merge conflicts |
| 225 (see 'hg help evolve.interrupted') | 225 (see 'hg help evolve.interrupted') |
| 226 [1] | 226 [240] |
| 227 $ hg resolve -l | 227 $ hg resolve -l |
| 228 U babar | 228 U babar |
| 229 $ hg log -G | 229 $ hg log -G |
| 230 @ changeset: 7:b20d08eea373 | 230 @ changeset: 7:b20d08eea373 |
| 231 | tag: tip | 231 | tag: tip |