changeset 45826 | 21733e8c924f |
parent 45796 | e9555305c5c6 |
--- a/tests/test-rebase-bookmarks.t Sat Nov 07 21:50:28 2020 -0800 +++ b/tests/test-rebase-bookmarks.t Wed Oct 21 19:00:16 2020 -0700 @@ -173,7 +173,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 'c' > c $ hg resolve --mark c (no more unresolved files)