Why wasn't Aaron's merge code added to the main development tree? Where there any problems regarding this? If so, can't we just add his code roughly (I can submit a patch if you want) and work from there to get a working 'merge' in bzr? Koen.