From: Davide Libenzi <davidel@xmailserver.org>
Date: Thu, 29 Jun 2006 18:21:00 GMT
Subject: Re: Improved three-way blob merging code
Message-ID: <Pine.LNX.4.64.0606291118110.8615@alien.or.mcafeemobile.com>
In-Reply-To: <Pine.LNX.4.64.0606282157210.12404@g5.osdl.org>

On Wed, 28 Jun 2006, Linus Torvalds wrote:

> It would be lovely if libxdiff did a 3-way merge on its own, but this
> basically approximates it within that three_way_filemerge() function
> using external functionality.

This is my todo-list, that unfortunately is pretty crowded nowadays. I'll 
come graveling you main window once I have it ;)



- Davide