Painful user experience with 'hg resolve'

[Greg Ward]

On Thu, Aug 25, 2011 at 4:38 PM, Peter Arrenbrecht
<peter.arrenbrecht at gmail.com> wrote:
> Probably too late for all this. But I see your gripe and like remerge.
> mergestate would collide with merge, so harder to use via abbrevs.

Sure, we have to keep the existing four behaviours of resolve working.
But we don't have to *document* them if there is a clearer way
available.

I think I slightly prefer adding "remerge" and keeping "resolve
{-l,-m,-u}". That certainly avoid abbreviation problems! Plus it's a
clear description of what's going on: I merged it once, now I want to
try again (e.g. with a different merge tool): remerge.

Greg