From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: master 89ce83b: Merge from origin/emacs-25 Date: Fri, 06 May 2016 11:58:00 -0400 Message-ID: <3y1t5fkwl3.fsf@fencepost.gnu.org> References: <20160506061436.10556.24626@vcs.savannah.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1462550324 32427 80.91.229.3 (6 May 2016 15:58:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 6 May 2016 15:58:44 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri May 06 17:58:43 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ayi9K-0003U2-Ko for ged-emacs-devel@m.gmane.org; Fri, 06 May 2016 17:58:42 +0200 Original-Received: from localhost ([::1]:58912 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayi9D-0004G1-Dk for ged-emacs-devel@m.gmane.org; Fri, 06 May 2016 11:58:35 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34124) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayi8w-00042m-1L for emacs-devel@gnu.org; Fri, 06 May 2016 11:58:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ayi8k-0006yr-Gd for emacs-devel@gnu.org; Fri, 06 May 2016 11:58:12 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:46895) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayi8k-0006xo-Dp for emacs-devel@gnu.org; Fri, 06 May 2016 11:58:06 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1ayi8e-0005i3-JB; Fri, 06 May 2016 11:58:00 -0400 X-Spook: Cocaine Vaccine Mitigation CDC Domestic security X-Ran: OS~Zz_5eh{o^+K.,V|+zrP>wHY,oX^4@<'YwKt.HUMV5xL_D!VNfpdTZ,oGk%n:d%);m>l X-Hue: cyan X-Attribution: GM In-Reply-To: (Paul Eggert's message of "Fri, 06 May 2016 06:14:37 +0000") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:203647 Archived-At: Please could somone fix the test/automated directory in master. Again. This happens so often, it almost feels worth adding something to gitmerge.el.