emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Conflicts in rmail.el


From: Eli Zaretskii
Subject: Re: Conflicts in rmail.el
Date: Wed, 16 Nov 2011 05:50:44 +0200

> 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.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]