[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: master 2d7f4d9 12/15: ; Merge from origin/emacs-25
From: |
Eli Zaretskii |
Subject: |
Re: master 2d7f4d9 12/15: ; Merge from origin/emacs-25 |
Date: |
Tue, 12 Jan 2016 17:50:29 +0200 |
> From: Michael Albinus <address@hidden>
> Date: Tue, 12 Jan 2016 10:48:07 +0100
>
> John Wiegley <address@hidden> writes:
>
> > The following commits were skipped:
> >
> > 4e62197 Introduce check-expensive tests.
>
> I've merged this to the master branch manually.
John, why were those skipped? Did you bump into prblems trying to
merge them? Does gitmerge.el need some work?
It's not a catastrophe to have to make several merges by hand, but I
think we should in general avoid that, as doing too many of those is
error-prone.