[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: master 5fe9375 2/3: Merge from origin/emacs-26
|
From: |
Noam Postavsky |
|
Subject: |
Re: master 5fe9375 2/3: Merge from origin/emacs-26 |
|
Date: |
Tue, 14 May 2019 23:02:32 -0400 |
On Tue, 14 May 2019 at 20:38, Glenn Morris <address@hidden> 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