hg resolve

[Dirkjan Ochtman]

On 20/12/2008 23:32, Brendan Cully wrote:
> Right now merge files have two states, 'marked' (resolved) and
> 'unmarked' (need resolving). How about we add a third state,
> 'modified', which means that the file has been changed by the user
> since the last resolution attempt (eg if the user has manually fixed
> up the file). Attempting to merge a file in this state would abort
> with a warning (unless you used -f), and you could use resolve -u to
> put the file into 'unmarked' state so that a subsequent resolve would
> start over on that file, clobbering the working dir changes.

That sounds like exactly what we need.

Cheers,

Dirkjan