Mercurial > evolve
comparison tests/test-evolve-orphan-merge.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 | 8e4f6354b316 |
| children | f804b78e9ee5 c0921b5277a0 |
comparison
equal
deleted
inserted
replaced
| 5891:b13cb2d500ae | 5892:34cd08a46b6d |
|---|---|
| 208 atop:[11] foo to c | 208 atop:[11] foo to c |
| 209 merging c | 209 merging c |
| 210 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 210 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 211 unresolved merge conflicts | 211 unresolved merge conflicts |
| 212 (see 'hg help evolve.interrupted') | 212 (see 'hg help evolve.interrupted') |
| 213 [240] | 213 [1] |
| 214 | 214 |
| 215 $ echo FOObar > c | 215 $ echo FOObar > c |
| 216 $ hg resolve -m | 216 $ hg resolve -m |
| 217 (no more unresolved files) | 217 (no more unresolved files) |
| 218 continue: hg evolve --continue | 218 continue: hg evolve --continue |
| 264 atop:[13] foo to c | 264 atop:[13] foo to c |
| 265 merging c | 265 merging c |
| 266 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 266 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 267 unresolved merge conflicts | 267 unresolved merge conflicts |
| 268 (see 'hg help evolve.interrupted') | 268 (see 'hg help evolve.interrupted') |
| 269 [240] | 269 [1] |
| 270 | 270 |
| 271 $ echo foobar > c | 271 $ echo foobar > c |
| 272 $ hg resolve -m | 272 $ hg resolve -m |
| 273 (no more unresolved files) | 273 (no more unresolved files) |
| 274 continue: hg evolve --continue | 274 continue: hg evolve --continue |