changeset 45826 | 21733e8c924f |
parent 45771 | f90a5c211251 |
child 45906 | 95c4cca641f6 |
--- a/tests/test-rebase-dest.t Sat Nov 07 21:50:28 2020 -0800 +++ b/tests/test-rebase-dest.t Wed Oct 21 19:00:16 2020 -0700 @@ -49,7 +49,7 @@ merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') - [1] + [240] $ echo d > c $ hg resolve --mark --all (no more unresolved files)