Confusing message from "bzr resolve"

[Eli Zaretskii]

> From: Óscar_Fuentes <ofv at wanadoo.es>
> Cc: Eli Zaretskii <eliz at gnu.org>
> Date: Sat, 16 Jan 2010 13:22:50 +0100
> Posted-To: gmane.comp.version-control.bazaar-ng.general
> 
> >   FOO is not conflicted
> >
> > Is this message expected?  If it is, it's confusing: it may be
> > interpreted as an error message saying, in effect, that I tried to
> > resolve a conflict that didn't exist.
> >
> > Or did I do something wrong while resolving the conflict?
> 
> I guess you used Emacs for editing the conflicted file :-)

Of course.  Are there any other ways?

> When you saved the file, VC did a `bzr resolve FOO' on your behalf.

Right, I forgot about this (it's easy, since there's no visible
indication of that).

> In this case, it is Emacs who introduces the confussion. IMO it should
> advertise that it removed the conflict mark for that file.

Possibly.  But what else is wrong is that the BzrForEmacsDevs wiki
page says you should do it manually, whereas in most cases you don't.
I just fixed that.

Thanks.