How to do a manual bzr merge when "bzr merge" fails

[Ramana Radhakrishnan]

>
> Anyway, I doubt there's anybody else needs to know this: I've just posted it
> in case I get hit by a bus before next month.

It's probably something that should be documented and linked from
BzrTips or a "how to do an upstream merge" in the toolchain wiki (if
we had something like that ) ?

>
> Andrew
>
> _______________________________________________
> linaro-toolchain mailing list
> linaro-toolchain at lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/linaro-toolchain