Mercurial > evolve
comparison tests/test-evolve-content-divergent-basic.t @ 5747:8e4f6354b316 mercurial-5.6
tests: back out changeset b3d9e6c805d6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 28 Jan 2021 18:48:36 +0800 |
| parents | e5d91fd1f319 |
| children | 0f32359bcf3e fd039a7f0c3c |
comparison
equal
deleted
inserted
replaced
| 5746:feb28638ec6c | 5747:8e4f6354b316 |
|---|---|
| 342 merging d | 342 merging d |
| 343 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 343 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 344 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 344 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 345 unresolved merge conflicts | 345 unresolved merge conflicts |
| 346 (see 'hg help evolve.interrupted') | 346 (see 'hg help evolve.interrupted') |
| 347 [240] | 347 [1] |
| 348 | 348 |
| 349 $ echo foobar > d | 349 $ echo foobar > d |
| 350 $ hg resolve -m | 350 $ hg resolve -m |
| 351 (no more unresolved files) | 351 (no more unresolved files) |
| 352 continue: hg evolve --continue | 352 continue: hg evolve --continue |
| 402 merging d | 402 merging d |
| 403 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 403 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 404 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 404 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 405 unresolved merge conflicts | 405 unresolved merge conflicts |
| 406 (see 'hg help evolve.interrupted') | 406 (see 'hg help evolve.interrupted') |
| 407 [240] | 407 [1] |
| 408 | 408 |
| 409 $ echo watbar > d | 409 $ echo watbar > d |
| 410 $ hg resolve -m | 410 $ hg resolve -m |
| 411 (no more unresolved files) | 411 (no more unresolved files) |
| 412 continue: hg evolve --continue | 412 continue: hg evolve --continue |
| 613 merging a | 613 merging a |
| 614 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 614 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 615 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 615 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 616 unresolved merge conflicts | 616 unresolved merge conflicts |
| 617 (see 'hg help evolve.interrupted') | 617 (see 'hg help evolve.interrupted') |
| 618 [240] | 618 [1] |
| 619 | 619 |
| 620 $ cat > a <<EOF | 620 $ cat > a <<EOF |
| 621 > jungle | 621 > jungle |
| 622 > a | 622 > a |
| 623 > flore | 623 > flore |