changeset 45845 | 21733e8c924f |
parent 45150 | dc5e5577af39 |
child 48472 | 38941a28406a |
--- a/tests/test-sparse-profiles.t Sat Nov 07 21:50:28 2020 -0800 +++ b/tests/test-sparse-profiles.t Wed Oct 21 19:00:16 2020 -0700 @@ -201,7 +201,7 @@ 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') - [1] + [240] $ rm *.orig $ ls -A .hg