tests/test-largefiles-update.t
changeset 35704 41ef02ba329b
parent 35400 4441705b7111
child 35816 f6ca1e11d8b4
--- a/tests/test-largefiles-update.t	Thu Jan 04 21:37:03 2018 -0800
+++ b/tests/test-largefiles-update.t	Mon Jan 08 19:41:47 2018 +0530
@@ -138,7 +138,7 @@
   getting changed largefiles
   1 largefiles updated, 0 removed
   0 files updated, 1 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
   $ hg status -A large1
   M large1