Conflict while using "bzr pull"

[Wouter van Heyst]

On Tue, Dec 13, 2005 at 12:55:21AM +1100, Jamie Wilkinson wrote:
> This one time, at band camp, John Arbash Meinel wrote:
> >Well, actually, you don't have to do a multi-directory song and dance.
> 
> Thanks, that's good to know :)  But all I meant was to give you an extra
> datapoint, that you weren't hallucinating when you saw the error :)

Qua datapoints, I haven't updated my bzr.missing dir yet, will do so now
and see what happens.

Wouter van Heyst