changeset 45150 | dc5e5577af39 |
parent 44724 | 5c2a4f37eace |
child 45771 | f90a5c211251 |
--- a/tests/test-sparse.t Wed Apr 01 08:42:00 2020 -0500 +++ b/tests/test-sparse.t Mon Jul 13 16:42:44 2020 -0700 @@ -200,7 +200,7 @@ 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) + unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [1] $ hg debugsparse