# HG changeset patch # User Anton Shestakov # Date 1600343468 -28800 # Node ID 7a184d29fff5d26a3b1c6d93f02dfedf10baa54a # Parent 98e2613d797d6a04de0581d00c784050e77469c6 tests: graphlog now only shows '%' if there are unresolved conflicts CORE-TEST-OUTPUT-UPDATE: 85b03b1e4715 diff -r 98e2613d797d -r 7a184d29fff5 tests/test-evolve-interrupted.t --- 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