--- a/tests/test-sparse-profiles.t Tue Aug 21 15:09:22 2018 +0300
+++ b/tests/test-sparse-profiles.t Tue Aug 21 16:11:17 2018 +0300
@@ -119,7 +119,7 @@
Verify conflicting merge pulls in the conflicting changes
$ hg merge 1
- temporarily included 1 file(s) in the sparse checkout for merging
+ temporarily included 2 file(s) in the sparse checkout for merging
merging backend.sparse
merging data.py
warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')
@@ -184,7 +184,7 @@
$ hg rebase -d 2
rebasing 1:a2b1de640a62 "edit profile"
- temporarily included 1 file(s) in the sparse checkout for merging
+ temporarily included 2 file(s) in the sparse checkout for merging
merging backend.sparse
merging data.py
warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')