Mercurial > evolve
diff tests/test-evolve-interrupted.t @ 5542:7a184d29fff5
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 | a799f5d228f1 |
| children | ae4dbbf2b929 16ab2cc74b4b ad80552c706c |
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