# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1615434574 -28800
# Node ID 5341d7c30e6841bfb5d4f19c84a0f23430e53b46
# Parent  87006dcf2bb7a9214872525093d372e3873d4364# Parent  82040a455e71caf61be1e2468322b4ca74df16cb
branching: merge into stable in preparation for release

# no-check-commit

diff -r 82040a455e71 -r 5341d7c30e68 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Tue Mar 09 18:50:10 2021 +0800
+++ b/hgext3rd/evolve/evolvecmd.py	Thu Mar 11 11:49:34 2021 +0800
@@ -890,7 +890,6 @@
     Each hash in the description will be detected and, if matching an obsolete
     changeset, it will be replaced by its successors.
 
-
     Note: They might be case were such behavior might be is wrong, for example
     if the commit message is explicitely referencing an older, obsolete changesets.
     """
@@ -1061,7 +1060,6 @@
         return None
     return repo.commitctx(memctx)
 
-
 def _finalizerelocate(repo, orig, dest, nodenew, tr, category, evolvestate):
     if nodenew is not None:
         obsolete.createmarkers(repo, [(orig, (repo[nodenew],))],