diff tests/test-userguide.t @ 3924:f3713d41b85b mercurial-4.5

test-compat: merge mercurial-4.6 into mercurial-4.5
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 02 Aug 2018 01:58:44 +0200
parents fbcf9e92097e
children 19ec729f3ca2 3810ca63398f
line wrap: on
line diff
--- a/tests/test-userguide.t	Thu Aug 02 01:57:13 2018 +0200
+++ b/tests/test-userguide.t	Thu Aug 02 01:58:44 2018 +0200
@@ -38,8 +38,8 @@
   $ echo 'tweak feature Y' >> file1.c
   $ hg commit --amend -u alice -d '2 0' -m 'implement feature Y'
   $ hg shortlog -q -r fe0ecd3bd2a4
-  abort: hidden revision 'fe0ecd3bd2a4' was rewritten as: 934359450037!
-  (use --hidden to access hidden revisions)
+  abort: hidden revision 'fe0ecd3bd2a4'!
+  (use --hidden to access hidden revisions; successor: 934359450037)
   [255]
   $ hg --hidden shortlog -G
   @  2:934359450037  draft  implement feature Y