--- a/tests/test-sparse.t Tue Aug 21 15:09:22 2018 +0300
+++ b/tests/test-sparse.t Tue Aug 21 16:11:17 2018 +0300
@@ -189,7 +189,7 @@
$ hg rebase -d 1 -r 2 --config extensions.rebase=
rebasing 2:b91df4f39e75 "edit hide" (tip)
- temporarily included 1 file(s) in the sparse checkout for merging
+ temporarily included 2 file(s) in the sparse checkout for merging
merging hide
warning: conflicts while merging hide! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
@@ -224,7 +224,7 @@
$ hg up -q 1
$ hg merge -r 2
- temporarily included 1 file(s) in the sparse checkout for merging
+ temporarily included 2 file(s) in the sparse checkout for merging
merging hide
warning: conflicts while merging hide! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved