tests/test-merge-halt.t
changeset 45150 dc5e5577af39
parent 34884 05535d0dea68
child 45826 21733e8c924f
--- a/tests/test-merge-halt.t	Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-merge-halt.t	Mon Jul 13 16:42:44 2020 -0700
@@ -27,7 +27,7 @@
   merging b
   merging a failed!
   merging b failed!
-  unresolved conflicts (see hg resolve, then hg rebase --continue)
+  unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   [1]
 
   $ hg resolve --list