changeset 4676 | b6c819facbe8 |
parent 4576 | 96ce1030d2fb |
child 5293 | 4da1d21231ae |
--- a/tests/test-unstability-resolution-result.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-unstability-resolution-result.t Thu Jun 06 17:37:42 2019 +0800 @@ -90,7 +90,8 @@ atop:[5] changea merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg revert -r "orphan()" a $ hg diff