--- a/tests/test-sparse-merges.t Tue Aug 21 15:09:22 2018 +0300
+++ b/tests/test-sparse-merges.t Tue Aug 21 16:11:17 2018 +0300
@@ -172,10 +172,13 @@
d
$ hg merge
- abort: $ENOENT$: $TESTTMP/mvtest/a
- [255]
+ temporarily included 1 file(s) in the sparse checkout for merging
+ merging a and amove to amove
+ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+ (branch merge, don't forget to commit)
$ hg up -C 4
+ cleaned up 1 temporarily added file(s) from the sparse checkout
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge