[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] explicit_merge with ancestor
|
From: |
Timothy Brownawell |
|
Subject: |
Re: [Monotone-devel] explicit_merge with ancestor |
|
Date: |
Thu, 13 Jul 2006 10:47:01 -0500 |
On Thu, 2006-07-13 at 11:36 -0400, Craig Lennox wrote:
> Whatever happened to the optional ANCESTOR argument to explicit_merge?
Our merge algorithms improved, so it isn't really needed any more. We
don't need an ancestor at all unless there's a content conflict, and
then we now pick the best ancestor to use (we used to not usually pick a
very good one).
> It no longer appears to be supported by monotone, although the manual
> still claims its existence.
Then the manual needs to be updated.
Tim