changeset 45150 | dc5e5577af39 |
parent 44347 | 9c9cfecd4600 |
child 45771 | f90a5c211251 |
--- a/tests/test-rebase-transaction.t Wed Apr 01 08:42:00 2020 -0500 +++ b/tests/test-rebase-transaction.t Mon Jul 13 16:42:44 2020 -0700 @@ -107,7 +107,7 @@ rebasing 3:c26739dbe603 "C" (C) merging conflict warning: conflicts while merging conflict! (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] $ hg tglog o 5: D