From: Noam Postavsky <npostavs@gmail.com>
To: Glenn Morris <rgm@gnu.org>
Cc: Stefan Monnier <monnier@iro.umontreal.ca>,
Emacs developers <emacs-devel@gnu.org>
Subject: Re: master 5fe9375 2/3: Merge from origin/emacs-26
Date: Tue, 14 May 2019 23:02:32 -0400 [thread overview]
Message-ID: <CAM-tV-8PscJtHvkn54Y4-fGb1mXsAzjsMEAY+vR8TWYba6mtxg@mail.gmail.com> (raw)
In-Reply-To: <xl7eas7dsn.fsf@fencepost.gnu.org>
On Tue, 14 May 2019 at 20:38, Glenn Morris <rgm@gnu.org> wrote:
> > branch: master
> > commit 5fe9375a5164960c3ecb65a7ef6d742069b8a7d7
> > Merge: 0f63e17 02bee78
>
> > # Conflicts:
> > # lisp/textmodes/sgml-mode.el
>
> Please could you check the resolution of this conflict?
Yeah, it's fine, [1: e99a124110] in master just happened to remove a
:group nearby [2: 7dab3ee7ab]'s changes in emacs-26, but the changes
are actually entirely separated.
[1: e99a124110]: 2019-01-17 18:25:00 -0500
* lisp/textmodes/sgml-mode.el: Try and fix bug#33887.
https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=e99a1241108433a63879a2430d55f2a1910d3c89
[2: 7dab3ee7ab]: 2019-05-09 06:42:40 -0400
Recognize single quote attribute values in nxml and sgml (Bug#35381)
https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=7dab3ee7ab54b3c2e7bc24170376054786c01d6f
next prev parent reply other threads:[~2019-05-15 3:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190515001827.19811.454@vcs0.savannah.gnu.org>
[not found] ` <20190515001830.743C9206A2@vcs0.savannah.gnu.org>
2019-05-15 0:38 ` master 5fe9375 2/3: Merge from origin/emacs-26 Glenn Morris
2019-05-15 3:02 ` Noam Postavsky [this message]
2019-05-15 20:39 ` Glenn Morris
2019-05-15 20:50 ` How to see where/what the conflict was in git? (WAS: master 5fe9375 2/3: Merge from origin/emacs-26) Noam Postavsky
2019-05-15 22:29 ` Richard Copley
2019-05-15 23:06 ` master 5fe9375 2/3: Merge from origin/emacs-26 Noam Postavsky
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=CAM-tV-8PscJtHvkn54Y4-fGb1mXsAzjsMEAY+vR8TWYba6mtxg@mail.gmail.com \
--to=npostavs@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
--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).