Mercurial > evolve

diff tests/test-prev-next.t @ 3784:838fc71ddb9c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
next-prev: replace the error hint to mention about `--merge` flag
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 03 Jun 2018 03:21:25 +0530
parents 313484606461
children 25dfa95c37fd
line wrap: on
line diff
--- a/tests/test-prev-next.t	Sun Jun 03 03:13:47 2018 +0530
+++ b/tests/test-prev-next.t	Sun Jun 03 03:21:25 2018 +0530
@@ -425,7 +425,7 @@
   $ echo bar > bar
   $ hg prev
   abort: conflicting changes
-  (commit or update --clean to discard changes)
+  (do you want --merge?)
   [255]
 
   $ echo hi > bar
@@ -437,5 +437,5 @@
 
   $ hg next
   abort: conflicting changes
-  (commit or update --clean to discard changes)
+  (do you want --merge?)
   [255]