Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Lars Ingebrigtsen]

Paul Eggert <address@hidden> writes:

> Oh, sorry, I guess I misinterpreted the logs and Fabián did the merges
> (actually, merges) at about the same time?

*phew*  For a while there I thought my comprehension of git was even
lesser than it is.  :-)

> But your name is on one of
> the master-installed merges as the committer, so I'm puzzled.
> Whatever.  Anyway, the merges had quite a few conflicts that were
> resolved incorrectly.
>
> Did anything leak into the master that you didn't want?  The nnimap
> `never' expiration fix, say?  (Commit
> 0cdd599c54aeda36e7e0696b2f90d2c286153a1d.)  Or the shr-make-table-1
> patches (commits 1a369fc7f1ccec6954344ec1ee0211a4d24c312d and
> 776705f49c5cb4e66c7dcb316fe499aa6a183888)?  If so, now might be a good
> time to revert these.

Those two look OK, I think.

-- 
(domestic pets only, the antidote for overdose, milk.)
  bloggy blog http://lars.ingebrigtsen.no/