Mercurial > evolve
comparison tests/test-evolve-phase.t @ 6809:9903ee44e658 mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 26 Jun 2024 18:09:37 +0400 |
| parents | 1328195f76a9 |
| children | e5bd76f95145 |
comparison
equal
deleted
inserted
replaced
| 6808:c7d3e1d8c6f1 | 6809:9903ee44e658 |
|---|---|
| 95 hit merge conflicts; retrying merge in working copy (inmemory !) | 95 hit merge conflicts; retrying merge in working copy (inmemory !) |
| 96 merging a | 96 merging a |
| 97 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 97 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 98 unresolved merge conflicts | 98 unresolved merge conflicts |
| 99 (see 'hg help evolve.interrupted') | 99 (see 'hg help evolve.interrupted') |
| 100 [240] | 100 [1] |
| 101 | 101 |
| 102 $ hg diff | 102 $ hg diff |
| 103 diff -r 87495ea7c9ec a | 103 diff -r 87495ea7c9ec a |
| 104 --- a/a Thu Jan 01 00:00:00 1970 +0000 | 104 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
| 105 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | 105 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |