branch | stable |
changeset 45181 | 28163c5de797 |
parent 45150 | dc5e5577af39 |
child 45771 | f90a5c211251 |
--- a/tests/test-rebase-dest.t Tue Jul 14 10:25:41 2020 +0200 +++ b/tests/test-rebase-dest.t Mon Jul 20 21:56:27 2020 +0530 @@ -48,7 +48,7 @@ rebasing 3:0537f6b50def "dc" (tip) merging c warning: conflicts while merging c! (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] $ echo d > c $ hg resolve --mark --all