Mercurial > evolve

changeset 5542:7a184d29fff5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: graphlog now only shows '%' if there are unresolved conflicts CORE-TEST-OUTPUT-UPDATE: 85b03b1e4715
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 17 Sep 2020 19:51:08 +0800
parents 98e2613d797d
children 75ca371bd9d1
files tests/test-evolve-interrupted.t
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-interrupted.t	Thu Sep 17 20:26:55 2020 +0200
+++ b/tests/test-evolve-interrupted.t	Thu Sep 17 19:51:08 2020 +0800
@@ -52,7 +52,7 @@
   $ hg l
   @  2 apricot and blueberry
   
-  %  1 banana
+  *  1 banana
   |
   x  0 apricot
   
@@ -80,7 +80,7 @@
   $ hg l
   @  2 apricot and blueberry
   
-  %  1 banana
+  *  1 banana
   |
   x  0 apricot