Mercurial > evolve
comparison tests/test-evolve-inmemory.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 | e6ae5af97683 |
comparison
equal
deleted
inserted
replaced
| 5891:b13cb2d500ae | 5892:34cd08a46b6d |
|---|---|
| 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:52da76e91abb draft tip | 75 @ 6:52da76e91abb draft tip |
| 76 | C | 76 | C |
| 77 | * 5:eae7899dd92b draft E | 77 | * 5:eae7899dd92b draft E |
| 78 | | E | 78 | | E |