tests/test-largefiles-update.t
changeset 45150 dc5e5577af39
parent 42588 f6540aba8e3e
child 45794 f90a5c211251
--- a/tests/test-largefiles-update.t	Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-largefiles-update.t	Mon Jul 13 16:42:44 2020 -0700
@@ -593,7 +593,7 @@
   what do you want to do? o
   merging normal1
   warning: conflicts while merging normal1! (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]
   $ cat .hglf/large1
   58e24f733a964da346e2407a2bee99d9001184f5