Mercurial > evolve

changeset 5304:83ceafbaa7d6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge into stable in preparation for release
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 08 May 2020 18:22:26 +0800
parents a828c7a7ace1 (diff) 34c8aa32bc56 (current diff)
children 8cf87826d9fa
files tests/test-evolve-content-divergent-first-changeset.t
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-first-changeset.t	Sun May 03 15:39:56 2020 +0800
+++ b/tests/test-evolve-content-divergent-first-changeset.t	Fri May 08 18:22:26 2020 +0800
@@ -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.