diff -r 87047efbc6a6 -r dc5e5577af39 tests/test-resolve.t --- a/tests/test-resolve.t Wed Apr 01 08:42:00 2020 -0500 +++ b/tests/test-resolve.t Mon Jul 13 16:42:44 2020 -0700 @@ -520,7 +520,7 @@ warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark') warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark') warning: conflicts while merging emp3! (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] Test when commands.resolve.confirm config option is not set: