# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1582895922 -25200
# Node ID 7fa4bb23a78aee72f89f4d2e07046fabeafdea3c
# Parent  7bcda49915e8fe97898797f28718694df4167ba0# Parent  f93bf36d0c19889d055f05380353b944a7c70dbe
branching: merge into stable in preparation for release

diff -r 7bcda49915e8 -r 7fa4bb23a78a tests/test-evolve-content-divergent-first-changeset.t
--- 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.
 
diff -r 7bcda49915e8 -r 7fa4bb23a78a tests/test-evolve-orphan-merge.t