--- a/hgext/histedit.py Thu Nov 03 17:31:14 2016 -0700
+++ b/hgext/histedit.py Mon Oct 17 23:16:55 2016 +0200
@@ -1405,12 +1405,12 @@
% node.short(missing[0]))
def adjustreplacementsfrommarkers(repo, oldreplacements):
- """Adjust replacements from obsolescense markers
+ """Adjust replacements from obsolescence markers
Replacements structure is originally generated based on
histedit's state and does not account for changes that are
not recorded there. This function fixes that by adding
- data read from obsolescense markers"""
+ data read from obsolescence markers"""
if not obsolete.isenabled(repo, obsolete.createmarkersopt):
return oldreplacements