Mercurial > evolve
comparison tests/test-unstability-resolution-result.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 | ed7ff9c0a940 |
| children | 0095a5240db5 |
comparison
equal
deleted
inserted
replaced
| 5746:feb28638ec6c | 5747:8e4f6354b316 |
|---|---|
| 90 atop:[5] changea | 90 atop:[5] changea |
| 91 merging a | 91 merging a |
| 92 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 92 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 93 unresolved merge conflicts | 93 unresolved merge conflicts |
| 94 (see 'hg help evolve.interrupted') | 94 (see 'hg help evolve.interrupted') |
| 95 [240] | 95 [1] |
| 96 $ hg revert -r "orphan()" a | 96 $ hg revert -r "orphan()" a |
| 97 $ hg diff | 97 $ hg diff |
| 98 diff -r 66719795a494 a | 98 diff -r 66719795a494 a |
| 99 --- a/a Thu Jan 01 00:00:00 1970 +0000 | 99 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
| 100 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | 100 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |