This one time, at band camp, Aaron Bentley wrote: >I've just merged some significant changes to baz-import, mostly work >done by Robert Collins. As a result, baz-import now translates merge >data into the correct bzr equivalent. Sorry, what's the url for the mainline now?