--- a/tests/test-rebase-inmemory.t Sat Aug 17 18:28:55 2019 +0900
+++ b/tests/test-rebase-inmemory.t Wed Aug 21 13:14:39 2019 -0700
@@ -506,6 +506,7 @@
$ hg rebase -s 2 -d 7
rebasing 2:177f92b77385 "c"
abort: outstanding merge conflicts
+ (use 'hg resolve' to resolve)
[255]
$ hg resolve -l
U e