--- a/tests/test-status-color.t Fri Dec 03 21:50:25 2021 -0800
+++ b/tests/test-status-color.t Thu Dec 02 22:59:36 2021 -0800
@@ -375,8 +375,8 @@
created new head
$ hg merge
merging a
+ warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
merging b
- warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon