> We're facing an unexpected conflict, which might be a bug in > bzr. Basically, there are two people involved: Chris and Gustavo. [...] Just got precisely the same problem twice again. :-( -- Gustavo Niemeyer http://niemeyer.net