tests/test-rebase-detach.t
changeset 45826 21733e8c924f
parent 45771 f90a5c211251
--- a/tests/test-rebase-detach.t	Sat Nov 07 21:50:28 2020 -0800
+++ b/tests/test-rebase-detach.t	Wed Oct 21 19:00:16 2020 -0700
@@ -298,7 +298,7 @@
   merging B
   warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
-  [1]
+  [240]
   $ hg resolve --all -t internal:local
   (no more unresolved files)
   continue: hg rebase --continue