New merge tool system in mainline
Leo Razoumov
slonik.az at gmail.com
Tue Feb 5 07:41:50 CST 2008
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.
--Leo--
More information about the Mercurial
mailing list