Confusing message from "bzr resolve"

[Eli Zaretskii]

> From: Óscar_Fuentes <ofv at wanadoo.es>
> Date: Sun, 17 Jan 2010 00:36:53 +0100
> 
> Ben Finney <ben+bazaar at benfinney.id.au> writes:
> 
> >> > 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.
> >
> > It wasn't the case for quite a while (by which I mean, Emacs VC would
> > not resolve conflicts in Bazaar). I don't know how recently that
> > changed.
> 
> Several months, at least.

"bzr annotate" says 2008-03-06, so it's almost two years.  It was
added before Emacs 23.1 was released.

> Considering that the mentioned wiki page is aimed at Emacs developers,
> and those use mostly the development version of Emacs, it is not
> important to pinpoint the version that introduced the feature.

Right.  They will only have problems if the use Emacs 22 or older.