From: Thierry Volpiatto <thierry.volpiatto@gmail.com>
To: emacs-devel@gnu.org
Subject: Conflicts in rmail.el
Date: Tue, 15 Nov 2011 21:03:39 +0100 [thread overview]
Message-ID: <87k4712lwk.fsf@gmail.com> (raw)
Hi,
could someone fix existings conflicts in rmail.el?
--8<---------------cut here---------------start------------->8---
Text conflict in lisp/mail/rmail.el
Conflict adding file lisp/mail/rmail.el.BASE. Moved existing file to lisp/mail/rmail.el.BASE.moved.
Conflict adding file lisp/mail/rmail.el.OTHER. Moved existing file to lisp/mail/rmail.el.OTHER.moved.
Conflict adding file lisp/mail/rmail.el.THIS. Moved existing file to lisp/mail/rmail.el.THIS.moved.
--8<---------------cut here---------------end--------------->8---
--8<---------------cut here---------------start------------->8---
;;;***
\f
<<<<<<< TREE
<<<<<<< TREE
;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "b20346e7178c45a313b9cabd004c21fb")
=======
;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "5d992206e382290d07ad7d9a2bf250c9")
>>>>>>> MERGE-SOURCE
=======
;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "a79f498959deded8fa9d88a7dca93bc0")
>>>>>>> MERGE-SOURCE
;;; Generated autoloads from rmailmm.el
--8<---------------cut here---------------end--------------->8---
Thanks.
--
Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997
next reply other threads:[~2011-11-15 20:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-15 20:03 Thierry Volpiatto [this message]
2011-11-15 20:27 ` Conflicts in rmail.el Eli Zaretskii
2011-11-15 21:38 ` Thierry Volpiatto
2011-11-15 21:46 ` Stefan Monnier
2011-11-15 21:56 ` Thierry Volpiatto
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=87k4712lwk.fsf@gmail.com \
--to=thierry.volpiatto@gmail.com \
--cc=emacs-devel@gnu.org \
/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.