diff tests/test-merge1.t @ 43045:8c4f32b907e6

unfinishedstate: suggested `hg update .` (including `.`) to complete update `hg update` can update to a different and undesired commit. For users who have commands.update.requiredest=yes, it's even an error to run just `hg update. Differential Revision: https://phab.mercurial-scm.org/D6956
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 03 Oct 2019 13:18:15 -0700
parents 12243f15d53e
children a736ab681b78
line wrap: on
line diff
--- a/tests/test-merge1.t	Mon Sep 30 17:26:41 2019 -0700
+++ b/tests/test-merge1.t	Thu Oct 03 13:18:15 2019 -0700
@@ -49,7 +49,7 @@
   ? b/nonempty
   # The repository is in an unfinished *update* state.
   
-  # To continue:    hg update
+  # To continue:    hg update .
   
 
   $ rm b/nonempty