diff -r 91c405f84cf7 -r d49e490a9e85 tests/test-sparse-merges.t
--- a/tests/test-sparse-merges.t	Fri Jul 27 14:53:28 2018 +0300
+++ b/tests/test-sparse-merges.t	Fri Jul 27 14:56:10 2018 +0300
@@ -112,5 +112,9 @@
   a
 
   $ hg merge
-  abort: $ENOENT$: '$TESTTMP/ytest/d'
-  [255]
+  temporarily included 1 file(s) in the sparse checkout for merging
+  local [working copy] changed d which other [merge rev] deleted
+  use (c)hanged version, (d)elete, or leave (u)nresolved? u
+  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
+  [1]