Re: 3 way merge in python

["Stephen Kennedy" <stevek gnome org>]

HI Yannick, have a look at diffutil.py _merge_diffs. That'll tell you
the conflicts. The nonconflicting changes are just list slices.

Stephen.

> I want to make a "smarter" wiki so I looked a bit at how SCM works.  I
> have a good idea of how to implement the storage to ease branching and
> merging but I still don't get how to perform the actual content 3 way
> merge.  Could you point me to the relevant parts of Meld that do the 3
> way merge.  Is there a Python library that will handle that?