# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1588933346 -28800
# Node ID 83ceafbaa7d670564214c05f37fa5e69166ed331
# Parent  a828c7a7ace1858fac9b55cd20c0bb4430ecd19a# Parent  34c8aa32bc561323e7fa030440c4e6a31a2f6a45
branching: merge into stable in preparation for release

diff -r 34c8aa32bc56 -r 83ceafbaa7d6 tests/test-evolve-content-divergent-first-changeset.t
--- 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.