Mercurial > evolve
diff tests/test-evolve-public-content-divergent-discard.t @ 5620:eb326644dc29
branching: merge stable into default
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 28 Oct 2020 20:24:26 +0100 |
parents | 5907b495901e 5673730db8d5 |
children | e5d91fd1f319 6eb9f82b43ba |
line wrap: on
line diff
--- a/tests/test-evolve-public-content-divergent-discard.t Sun Oct 25 21:38:37 2020 +0800 +++ b/tests/test-evolve-public-content-divergent-discard.t Wed Oct 28 20:24:26 2020 +0100 @@ -509,6 +509,7 @@ $ hg par changeset: 5:e800202333a4 + tag: tip parent: 2:155349b645be user: test date: Thu Jan 01 00:00:00 1970 +0000 @@ -626,6 +627,7 @@ $ hg par changeset: 5:e800202333a4 + tag: tip parent: 2:155349b645be user: test date: Thu Jan 01 00:00:00 1970 +0000