Unexpected result from bzr merge: line missing?

[Terry Jones]

Hi Monty

> Sometimes (as you are finding here) you may need to manually decide what
> the resulting text will be, and it may very well include some elements
> from each block. That's ok - the merge conflicts are essentially places
> where it's asking you to make a human choice anyway.

Yes, agreed, I have to do that sometimes. I guess I just wasn't regarding
this as being one of those cases...

> I don't know of many instances (I can't think of any, and I've been a
> user for 4 years now) where it got the sections outside of the merge
> conflict markers incorrect and I've had to fix it.

... but now that you say it, I see that you're right - that the problem can
be totally resolved just by working on the text within the markers.  That's
reassuring.

Thanks!

Terry