My bzr tree now has some code in bzrlib.merge3 to do a 3-way text merge in pure Python. I think(?) this might remove the main external dependency, aside from patch for importing changesets, which I hope we can also fix. I think it works. Comments or bug reports are welcome. -- Martin