--- a/tests/test-update-branches.t	Fri Feb 28 10:49:13 2020 -0800
+++ b/tests/test-update-branches.t	Fri Feb 28 10:30:18 2020 -0800
@@ -347,8 +347,8 @@
   $ hg revert -r . a
   $ rm a.orig
   $ hg ci -m empty
-  nothing changed
-  [1]
+  abort: unresolved merge conflicts (see 'hg help resolve')
+  [255]
   $ hg resolve -m a
   (no more unresolved files)
   $ hg resolve -l