changeset 37108 | 0351fb0153ba |
parent 37106 | 3d3cff1f6bde |
child 37125 | 6f570c501e3e |
--- a/hgext/histedit.py Mon Mar 05 00:02:13 2018 -0500 +++ b/hgext/histedit.py Mon Mar 05 00:28:40 2018 -0500 @@ -566,7 +566,7 @@ # edits are "in place" we do not need to make any merge, # just applies changes on parent for editing cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True) - stats = None + stats = mergemod.updateresult(0, 0, 0, 0) else: try: # ui.forcemerge is an internal variable, do not document