--- a/tests/test-rebase-pull.t Thu Oct 22 13:31:34 2020 -0700
+++ b/tests/test-rebase-pull.t Mon Oct 12 12:44:18 2020 -0700
@@ -80,7 +80,7 @@
$ hg pull --rebase
abort: uncommitted changes
(cannot pull with rebase: please commit or shelve your changes first)
- [255]
+ [20]
$ hg update --clean --quiet
Abort pull early if another operation (histedit) is in progress:
@@ -94,7 +94,7 @@
$ hg pull --rebase
abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort')
- [255]
+ [20]
$ hg histedit --abort --quiet
Abort pull early with pending uncommitted merge:
@@ -117,7 +117,7 @@
$ hg pull --rebase
abort: outstanding uncommitted merge
(cannot pull with rebase: please commit or shelve your changes first)
- [255]
+ [20]
$ hg update --clean --quiet
Abort pull early with unclean subrepo: