diff -r 11be6b7f95da -r bf4d5d8dc2aa hgext/histedit.py --- a/hgext/histedit.py Mon Dec 14 22:37:31 2015 +0000 +++ b/hgext/histedit.py Mon Dec 14 23:04:17 2015 +0000 @@ -602,7 +602,7 @@ def run(self): repo = self.repo rulectx = repo[self.node] - hg.update(repo, self.state.parentctxnode) + hg.update(repo, self.state.parentctxnode, quietempty=True) applychanges(repo.ui, repo, rulectx, {}) raise error.InterventionRequired( _('Make changes as needed, you may commit or record as needed '