Mercurial > evolve
comparison tests/test-evolve-inmemory.t @ 6181:e6ae5af97683 mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 22 Feb 2022 08:19:44 +0300 |
| parents | fd039a7f0c3c |
| children | 1328195f76a9 |
comparison
equal
deleted
inserted
replaced
| 6180:0042d69b8648 | 6181:e6ae5af97683 |
|---|---|
| 68 hit merge conflicts; retrying merge in working copy | 68 hit merge conflicts; retrying merge in working copy |
| 69 merging B | 69 merging B |
| 70 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') | 70 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
| 71 unresolved merge conflicts | 71 unresolved merge conflicts |
| 72 (see 'hg help evolve.interrupted') | 72 (see 'hg help evolve.interrupted') |
| 73 [240] | 73 [1] |
| 74 $ hg glog | 74 $ hg glog |
| 75 @ 6:a2a0434af50b draft tip | 75 @ 6:a2a0434af50b draft tip |
| 76 | C | 76 | C |
| 77 | * 5:844900596917 draft E | 77 | * 5:844900596917 draft E |
| 78 | | E | 78 | | E |