changeset 27603 | 8a87627d263a |
parent 27600 | cfb26146a8cd |
child 27604 | 0e0e25a5e12a |
--- a/hgext/histedit.py Tue Dec 29 04:30:38 2015 +0000 +++ b/hgext/histedit.py Wed Dec 30 04:02:04 2015 +0000 @@ -485,7 +485,7 @@ wcpar = repo.dirstate.parents()[0] if ctx.p1().node() == wcpar: # edits are "in place" we do not need to make any merge, - # just applies changes on parent for edition + # just applies changes on parent for editing cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True) stats = None else: