diff mercurial/hg.py @ 7848:89e05c02a4af

resolve: move reset to localrepo.commit This way rebase doesn't leave a stale resolve state
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Mar 2009 16:58:41 -0500
parents 9fe7e6acf525
children a218ba5f60df
line wrap: on
line diff