changeset 26988 | 7e38d49bc713 |
parent 26972 | 4b0c3df5d635 |
child 27029 | 8279c5d116a0 |
--- a/hgext/strip.py Tue Nov 17 17:00:54 2015 -0800 +++ b/hgext/strip.py Tue Nov 17 17:02:35 2015 -0800 @@ -208,8 +208,7 @@ repo.dirstate.write(repo.currenttransaction()) # clear resolve state - ms = merge.mergestate(repo) - ms.reset(repo['.'].node()) + merge.mergestate.clean(repo, repo['.'].node()) update = False