interrupting a merge session

[Peter Weseloh]

2007/6/28, Brendan Cully <brendan at kublai.com>:

> It's not a bad idea, but this patch seems more complex than I would
> have expected. I would have thought you could just go through the
> calculate phase and dump the action list, with no changes to eg
> filemerge...


You are right. I simply do not know enough about Mercurial and Python to
come up with a better solution. But I am learning ...
I will try out your "imerge" extension which looks like a much smarter
approach. Thanks for providing it.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20070629/5fed98ae/attachment-0001.html>