Mercurial > evolve
changeset 5144:7fa4bb23a78a stable
branching: merge into stable in preparation for release
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Fri, 28 Feb 2020 20:18:42 +0700 |
parents | 7bcda49915e8 (current diff) f93bf36d0c19 (diff) |
children | c7aac40c85ff |
files | tests/test-evolve-content-divergent-first-changeset.t tests/test-evolve-orphan-merge.t |
diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-first-changeset.t Wed Mar 04 15:17:29 2020 +0100 +++ b/tests/test-evolve-content-divergent-first-changeset.t Fri Feb 28 20:18:42 2020 +0700 @@ -6,7 +6,6 @@ > evolution.allowdivergence = True > EOF - This test file tests the case of content-divergence resolution of changesets that have the null revision as the parent.