Mercurial > evolve

diff tests/test-evolve-content-divergent-case-A5.t @ 6809:9903ee44e658 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 Wed, 26 Jun 2024 18:09:37 +0400
parents fd039a7f0c3c
children
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-case-A5.t	Wed Jun 26 16:24:32 2024 +0400
+++ b/tests/test-evolve-content-divergent-case-A5.t	Wed Jun 26 18:09:37 2024 +0400
@@ -73,7 +73,7 @@
   $ cd ../local
   $ hg pull -qu
   $ hg rebase -r 'desc(C)' -d 'desc(A)'
-  rebasing 3:d90aa47aa5d3 tip "C"
+  rebasing 3:d90aa47aa5d3 "C" (tip)
 
   $ cd ../other
   $ hg pull -qu