From: Bastien <bzg@gnu.org>
To: Glenn Morris <rgm@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: Merge conflict cookie in dired.el (current HEAD in bzr)
Date: Fri, 28 Sep 2012 00:56:50 +0200 [thread overview]
Message-ID: <87d317rs5p.fsf@bzg.ath.cx> (raw)
In-Reply-To: <y2pq57nm63.fsf@fencepost.gnu.org> (Glenn Morris's message of "Thu, 27 Sep 2012 18:19:48 -0400")
Glenn Morris <rgm@gnu.org> writes:
> Bastien wrote:
>
>> There is this merge conflict indication in dired.el
>> which prevents Emacs from building:
>
> That is local to your copy.
Indeed. No idea how this ended up here.
> bzr revert lisp/dired.el
Done. I could install the latest Emacs fine. Thanks,
--
Bastien
next prev parent reply other threads:[~2012-09-27 22:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-27 22:00 Merge conflict cookie in dired.el (current HEAD in bzr) Bastien
2012-09-27 22:19 ` Glenn Morris
2012-09-27 22:56 ` Bastien [this message]
2012-09-28 7:27 ` Eli Zaretskii
2012-09-28 7:36 ` Bastien
2012-09-28 10:02 ` Andreas Schwab
2012-09-28 15:30 ` Juri Linkov
2012-09-28 18:15 ` Paul Eggert
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d317rs5p.fsf@bzg.ath.cx \
--to=bzg@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=rgm@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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).