Mercurial > evolve

diff tests/test-evolve-content-divergent-case-A4.t @ 5892:34cd08a46b6d 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 Sat, 24 Apr 2021 20:01:39 +0800
parents 03410b04cf10
children
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-case-A4.t	Sat Apr 24 19:54:14 2021 +0800
+++ b/tests/test-evolve-content-divergent-case-A4.t	Sat Apr 24 20:01:39 2021 +0800
@@ -84,12 +84,12 @@
   $ cd ../local
   $ hg pull -qu
   $ hg rebase -r 'desc(D)' -d 'desc(C)'
-  rebasing 4:6a418860e87b tip "D"
+  rebasing 4:6a418860e87b "D" (tip)
 
   $ cd ../other
   $ hg pull -qu
   $ hg rebase -r 'desc(D)' -d 'desc(B)'
-  rebasing 4:6a418860e87b tip "D"
+  rebasing 4:6a418860e87b "D" (tip)
   $ hg push -q
 
   $ cd ../local