comparison Makefile @ 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 089cb73f8ecc
children 606723f4a327
comparison
equal deleted inserted replaced
7847:30cb79d84352 7848:89e05c02a4af