From: Thierry Volpiatto <thierry.volpiatto@gmail.com>
To: Stefan Monnier <monnier@IRO.UMontreal.CA>
Cc: Eli Zaretskii <eliz@gnu.org>, emacs-devel@gnu.org
Subject: Re: Conflicts in rmail.el
Date: Tue, 15 Nov 2011 22:56:43 +0100 [thread overview]
Message-ID: <877h312go4.fsf@gmail.com> (raw)
In-Reply-To: <jwvmxbxvz50.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Tue, 15 Nov 2011 16:46:09 -0500")
Stefan Monnier <monnier@IRO.UMontreal.CA> 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
next prev parent reply other threads:[~2011-11-15 21:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-15 20:03 Conflicts in rmail.el Thierry Volpiatto
2011-11-15 20:27 ` Eli Zaretskii
2011-11-15 21:38 ` Thierry Volpiatto
2011-11-15 21:46 ` Stefan Monnier
2011-11-15 21:56 ` Thierry Volpiatto [this message]
2011-11-16 3:50 ` Eli Zaretskii
2011-11-16 7:25 ` Thierry Volpiatto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877h312go4.fsf@gmail.com \
--to=thierry.volpiatto@gmail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@IRO.UMontreal.CA \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.