Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge into stable in preparation for release stable
authorAnton Shestakov <av6@dwimlabs.net>
Fri, 28 Feb 2020 20:18:42 +0700
branchstable
changeset 5144 7fa4bb23a78a
parent 5142 7bcda49915e8 (current diff)
parent 5133 f93bf36d0c19 (diff)
child 5145 c7aac40c85ff
branching: merge into stable in preparation for release
tests/test-evolve-content-divergent-first-changeset.t file | annotate | diff | comparison | revisions
tests/test-evolve-orphan-merge.t file | annotate | diff | comparison | revisions 
--- 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.
evolve