--- a/tests/test-graft.t Mon Nov 23 16:20:02 2020 -0800
+++ b/tests/test-graft.t Mon Nov 23 16:48:13 2020 -0800
@@ -324,7 +324,7 @@
$ hg graft -c
grafting 4:9c233e8e184d "4"
abort: unresolved merge conflicts (see 'hg help resolve')
- [255]
+ [20]
Fix up: