tests/test-rebase-inmemory.t
changeset 45840 527ce85c2e60
parent 45827 8d72e29ad1e0
child 46009 d767f71b9158
--- a/tests/test-rebase-inmemory.t	Thu Oct 22 13:31:34 2020 -0700
+++ b/tests/test-rebase-inmemory.t	Mon Oct 12 12:44:18 2020 -0700
@@ -484,7 +484,7 @@
   transaction abort!
   rollback completed
   abort: uncommitted changes
-  [255]
+  [20]
   $ cat a
   dirty
 
@@ -503,7 +503,7 @@
   $ hg rebase -s 2 -d 7
   abort: outstanding uncommitted merge
   (use 'hg commit' or 'hg merge --abort')
-  [255]
+  [20]
   $ hg resolve -l
   U e
 
@@ -893,7 +893,7 @@
   $ hg rebase -r 3 -d 1 -t:merge3
   abort: rebase in progress
   (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
-  [255]
+  [20]
   $ hg resolve --list
   U foo
   $ hg resolve --all --re-merge -t:other