New merge tool system in mainline

[Steve Borho]

On Tue, 2008-02-05 at 08:41 -0500, Leo Razoumov wrote:
> On 2/3/08, Matt Mackall <mpm at selenic.com> wrote:
> > I've introduced a powerful new merge tool scheme to mainline, heavily
> > inspired by Steve and Arve's work for TortoiseHG (thanks, guys!). The
> > basic idea is to make setting up a merge tool as simple as possible.
> 
> Does it support "multi-session merge"??
> 
> By multi-session merge I mean the following. Let say, I have to merge
> 10 files but instead of doing it in one uninterrupted go I would like
> to do 5 files in the morning, take lunch, and then merge the remaining
> 5 files. I would like to be able to fire
> "hg merge" several times and let Hg keep track of partial merge
> progress. I think this issue was discussed on this list in the past
> but I am not aware whether any conclusion has been reached.

The 'imerge' extension provides this feature.

-- 
Steve Borho (steve at borho.org)
http://www.borho.org/~steve/steve.asc
Key fingerprint = 2D08 E7CF B624 624C DE1F  E2E4 B0C2 5292 F2C6 2C8C