tests/test-resolve.t

--- a/tests/test-resolve.t	Sat Nov 07 21:50:28 2020 -0800
+++ b/tests/test-resolve.t	Wed Oct 21 19:00:16 2020 -0700
@@ -464,7 +464,7 @@
   warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
   warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
-  [1]
+  [240]
 
 Test when commands.resolve.confirm config option is not set:
 ===========================================================