changeset 45826 | 21733e8c924f |
parent 45171 | 5322e738be0f |
--- a/tests/test-state-extension.t Sat Nov 07 21:50:28 2020 -0800 +++ b/tests/test-state-extension.t Wed Oct 21 19:00:16 2020 -0700 @@ -101,7 +101,7 @@ merging file1 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') unresolved conflicts (see 'hg resolve', then 'hg chainify --continue') - [1] + [240] $ hg status --config commands.status.verbose=True M file1 ? file1.orig