Mercurial > evolve

diff tests/test-evolve-content-divergent-case-A3.t @ 6181:e6ae5af97683 mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 22 Feb 2022 08:19:44 +0300
parents 03410b04cf10
children 1328195f76a9
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-case-A3.t	Tue Feb 22 08:00:24 2022 +0300
+++ b/tests/test-evolve-content-divergent-case-A3.t	Tue Feb 22 08:19:44 2022 +0300
@@ -79,7 +79,7 @@
   $ cd ../local
   $ hg pull -qu
   $ hg rebase -r 'desc(C)' -d 'desc(B)'
-  rebasing 3:928c8849ec01 tip "C"
+  rebasing 3:928c8849ec01 "C" (tip)
 
   $ cd ../other
   $ hg pull -qu