[Top][All Lists]

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

Re: Conflicts in rmail.el

From: Thierry Volpiatto
Subject: Re: Conflicts in rmail.el
Date: Tue, 15 Nov 2011 22:56:43 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.91 (gnu/linux)

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

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

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

reply via email to

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