Mercurial > evolve

diff tests/test-evolve-public-content-divergent-corner-cases.t @ 5541:98e2613d797d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 17 Sep 2020 20:26:55 +0200
parents 7b82a621e343 452651e69848
children 5907b495901e
line wrap: on
line diff
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Tue Jul 21 01:02:46 2020 +0800
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Thu Sep 17 20:26:55 2020 +0200
@@ -151,7 +151,7 @@
   |   c
   |  +cc
   |
-  %  4:c0d7ee6604ea added c
+  o  4:c0d7ee6604ea added c
   |   public
   |
   |  diff -r c9241b0f2d5b -r c0d7ee6604ea c