interrupting a merge session

[Mathieu Clabaut]

On 6/28/07, Brendan Cully <brendan at kublai.com> wrote:
>
> > It would be great if mercurial keeps track of "files waiting to be
> merged".
> > It would also help to provide a command like "hg resolve" so that a
> > user could take files off and on the list. It is handy if certain
> > files should be merged by someone else like a more experience
> > developer, project lead, etc.
>
> I've thrown together a prototype extension for doing this kind of
> merging. It's less than an hour's work, so don't expect
> perfection. It's a start though :)
>

 Very nice !
 I tried it and like it.
 Perhaps some switch allowing status status subcommand to produce only
resolved or unresolved files may be uesfull for script processing.

 -mathieu
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20070629/2861c6e2/attachment-0001.html>