changeset 45150 | dc5e5577af39 |
parent 44724 | 5c2a4f37eace |
child 45826 | 21733e8c924f |
--- a/tests/test-sparse-profiles.t Wed Apr 01 08:42:00 2020 -0500 +++ b/tests/test-sparse-profiles.t Mon Jul 13 16:42:44 2020 -0700 @@ -200,7 +200,7 @@ merging data.py warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark') warning: conflicts while merging data.py! (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] $ rm *.orig $ ls -A