changeset 45150 | dc5e5577af39 |
parent 39707 | 5abc47d4ca6b |
child 45771 | f90a5c211251 |
--- a/tests/test-rebase-partial.t Wed Apr 01 08:42:00 2020 -0500 +++ b/tests/test-rebase-partial.t Mon Jul 13 16:42:44 2020 -0700 @@ -84,7 +84,7 @@ rebasing 2:ef8c0fe0897b "D" (D) merging file warning: conflicts while merging file! (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 rebase --abort rebase aborted