[RFC] Use KnitVersionedFile.plan_merge for all VersionedFiles

[Martin Pool]

On 14 Jul 2006, John Arbash Meinel <john at arbash-meinel.com> wrote:
> I also think we are deprecating weaves in the general sense. (Not
> support for them, just not recommending them for future work.)
> 
> I think the biggest advantage of weave merge is that it remembers
> deleted lines. Which can act as a synchronization point. However, I
> agree that it is probably better to be consistent with our merge algorithm.
> 
> So I agree that we should switch a common merge algorithm.

Yes, i think so too.

-- 
Martin