From: Glenn Morris <rgm@gnu.org>
To: Bastien <bzg@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: Merge conflict cookie in dired.el (current HEAD in bzr)
Date: Thu, 27 Sep 2012 18:19:48 -0400 [thread overview]
Message-ID: <y2pq57nm63.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <87ehln6s9l.fsf@bzg.ath.cx> (Bastien's message of "Fri, 28 Sep 2012 00:00:06 +0200")
Bastien wrote:
> There is this merge conflict indication in dired.el
> which prevents Emacs from building:
That is local to your copy.
bzr revert lisp/dired.el
next prev parent reply other threads:[~2012-09-27 22:19 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 [this message]
2012-09-27 22:56 ` Bastien
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=y2pq57nm63.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=bzg@gnu.org \
--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.