From: Glenn Morris <rgm@gnu.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Stefan Monnier <monnier@iro.umontreal.ca>, emacs-devel@gnu.org
Subject: Re: Strange ChangeLog entry after merge from emacs-24
Date: Mon, 08 Dec 2014 12:17:55 -0500 [thread overview]
Message-ID: <cgiohmt60s.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <83k322xdzq.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 08 Dec 2014 19:12:09 +0200")
Eli Zaretskii wrote:
> So there definitely was some problem in that merge.
FWIW, I often used to see that kind of thing with bzrmerge.el.
(IIRC I think the changelog-merge plugin did it better.)
It's just something the person doing the merge needs to watch out for,
or that people need to tidy up afterwards.
prev parent reply other threads:[~2014-12-08 17:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-06 8:36 Strange ChangeLog entry after merge from emacs-24 Eli Zaretskii
2014-12-07 17:42 ` Eli Zaretskii
2014-12-07 21:18 ` Stefan Monnier
2014-12-08 17:12 ` Eli Zaretskii
2014-12-08 17:17 ` Glenn Morris [this message]
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=cgiohmt60s.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--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.