Re: Conflicts in rmail.el

[Thierry Volpiatto]

Eli Zaretskii <address@hidden> writes:

>> From: Thierry Volpiatto <address@hidden>
>> Cc: Eli Zaretskii <address@hidden>,  address@hidden
>> Date: Tue, 15 Nov 2011 22:56:43 +0100
>> 
>> 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
>
> Both for the same reasons: autoloads written in those files.
>
> If you care about that (there's no reason to), run "make autoloads" in
> the lisp/ subdirectory after reverting.
No i don't care, thanks for explanation.

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