tests/test-merge-internal-tools-pattern.t
changeset 35704 41ef02ba329b
parent 26071 ff12a6c63c3d
child 48566 50de08904c63
--- a/tests/test-merge-internal-tools-pattern.t	Thu Jan 04 21:37:03 2018 -0800
+++ b/tests/test-merge-internal-tools-pattern.t	Mon Jan 08 19:41:47 2018 +0530
@@ -43,7 +43,7 @@
 
   $ hg merge
   0 files updated, 0 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]
 
   $ cat f