Re: Conflicts in rmail.el

[Thierry Volpiatto]

Stefan Monnier <address@hidden> writes:

>>> could someone fix existings conflicts in rmail.el?
>> Just "bzr revert" and move on.
>
> Well, "bzr revert" throws away all the changes you may have, so it's not
> necessarily a good idea.  But yes: those conflict are resolved by
> choosing any of the three options (and I really mean any: it shouldn't
> matter much which one you choose).
I have no personal changes there, but bzr revert have now reverted two
files:

 M  lisp/emacs-lisp/eieio.el
 M  lisp/mail/rmail.el

-- 
  Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997