Mercurial > evolve
comparison tests/test-stabilize-conflict.t @ 5892:34cd08a46b6d mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 24 Apr 2021 20:01:39 +0800 |
| parents | fd039a7f0c3c |
| children | 664f62e57231 1328195f76a9 |
comparison
equal
deleted
inserted
replaced
| 5891:b13cb2d500ae | 5892:34cd08a46b6d |
|---|---|
| 126 atop:[5] babar count up to ten | 126 atop:[5] babar count up to ten |
| 127 merging babar | 127 merging babar |
| 128 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') | 128 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') |
| 129 unresolved merge conflicts | 129 unresolved merge conflicts |
| 130 (see 'hg help evolve.interrupted') | 130 (see 'hg help evolve.interrupted') |
| 131 [240] | 131 [1] |
| 132 $ hg resolve -l | 132 $ hg resolve -l |
| 133 U babar | 133 U babar |
| 134 $ hg log -G | 134 $ hg log -G |
| 135 @ changeset: 5:e04690b09bc6 | 135 @ changeset: 5:e04690b09bc6 |
| 136 | tag: tip | 136 | tag: tip |
| 219 output file babar appears unchanged | 219 output file babar appears unchanged |
| 220 was merge successful (yn)? n | 220 was merge successful (yn)? n |
| 221 merging babar failed! | 221 merging babar failed! |
| 222 unresolved merge conflicts | 222 unresolved merge conflicts |
| 223 (see 'hg help evolve.interrupted') | 223 (see 'hg help evolve.interrupted') |
| 224 [240] | 224 [1] |
| 225 $ hg resolve -l | 225 $ hg resolve -l |
| 226 U babar | 226 U babar |
| 227 $ hg log -G | 227 $ hg log -G |
| 228 @ changeset: 7:b20d08eea373 | 228 @ changeset: 7:b20d08eea373 |
| 229 | tag: tip | 229 | tag: tip |