Mercurial > hg
diff mercurial/manifest.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 | 14a4337a9b9b |
children | d051342f1ad1 |