--- a/tests/test-resolve.t Wed Oct 21 19:00:16 2020 -0700
+++ b/tests/test-resolve.t Tue Oct 06 22:36:15 2020 -0700
@@ -191,7 +191,7 @@
$ hg resolve
abort: no files or directories specified
(use --all to re-merge all unresolved files)
- [255]
+ [10]
resolve --all should re-merge all unresolved files
$ hg resolve --all
@@ -406,7 +406,7 @@
R file2
$ hg resolve --mark --re-merge
abort: too many actions specified
- [255]
+ [10]
$ hg resolve --re-merge --all
merging file1
warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
@@ -416,7 +416,7 @@
$ hg resolve --config commands.resolve.explicit-re-merge=1 --all
abort: no action specified
(use --mark, --unmark, --list or --re-merge)
- [255]
+ [10]
$ hg resolve --config commands.resolve.explicit-re-merge=1 --re-merge --all
merging file1
warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
@@ -489,7 +489,7 @@
$ hg resolve
abort: no files or directories specified
(use --all to re-merge all unresolved files)
- [255]
+ [10]
$ hg resolve --all << EOF
> n
> EOF