merge3 code from bazaar-ng
Bryan O'Sullivan
bos at serpentine.com
Thu Aug 18 12:14:47 CDT 2005
On Thu, 2005-08-18 at 12:41 +0530, Aneesh Kumar wrote:
> Hi,
>
> I am not sure what the code is or how good it is. But may be one of
> the developers can take a look . I found the below information at
>
> http://sourcefrog.net/weblog/software/vc/bzr
>
> "One outcome of the research side is modules to do the fundamental vc
> algorithms of 3-way merge and weave in pure Python.
Thanks. We talk to the bzr developers quite regularly on IRC :-)
<b
More information about the Mercurial
mailing list