changeset 4676 | b6c819facbe8 |
parent 4577 | bcd52ce0916d |
--- a/tests/test-issue-5720.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-issue-5720.t Thu Jun 06 17:37:42 2019 +0800 @@ -61,7 +61,8 @@ atop:[3] b 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] Fix the conflict