From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: master 89ce83b: Merge from origin/emacs-25 Date: Fri, 6 May 2016 20:14:12 +0300 Message-ID: References: <20160506061436.10556.24626@vcs.savannah.gnu.org> <3y1t5fkwl3.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1462554929 8760 80.91.229.3 (6 May 2016 17:15:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 6 May 2016 17:15:29 +0000 (UTC) To: Glenn Morris , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri May 06 19:15:23 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 1ayjLW-0006MO-3p for ged-emacs-devel@m.gmane.org; Fri, 06 May 2016 19:15:22 +0200 Original-Received: from localhost ([::1]:59405 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayjLS-0000xj-BH for ged-emacs-devel@m.gmane.org; Fri, 06 May 2016 13:15:18 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayjLA-0000kk-O4 for emacs-devel@gnu.org; Fri, 06 May 2016 13:15:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ayjKz-0002tj-5d for emacs-devel@gnu.org; Fri, 06 May 2016 13:14:55 -0400 Original-Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:37891) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayjKx-0002it-S8; Fri, 06 May 2016 13:14:49 -0400 Original-Received: by mail-wm0-x22d.google.com with SMTP id g17so88070238wme.1; Fri, 06 May 2016 10:14:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=RgezZm17y3qM+nsLOuxvOeZgTWFFpykCY3h+LvRLkxs=; b=SCwVDTGHS4dFY7zuc40iDr084TqEpcfqOXQWGDg5+ZdDDWh8Yjkql0zMFWx/Nih4wV f/fLQVJbtzinXJ+fn9UYQ2mJ+YC3UzrBlDTp5i6eTRsCt9oz8zPKEVe5DpkAcjbU9WSO gJnCnoJtvfUwZ0Y4ZLshwDHJmqtmF3nbX+T/2tmmF4FPke5sOGhrdUGiS78qdEpTsc0b C2T26ut3tS09IlcO4UZs30xgIOj+mn3TQau3H/BtfBwEqHKTsbFlim8IVpguwmj6Dxk2 WZtrXrtcq0gx1/Rg8LIarrdCxRbqef/6eQASm62Os8mkE428wPNC06qJ98T/xh5Le9GV CDiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=RgezZm17y3qM+nsLOuxvOeZgTWFFpykCY3h+LvRLkxs=; b=A9YQs0Aqvwj/Y2HdoVQhpe8LOrksJhpuuJtRkgiDKAcUc5PnZHpNxxMmCh60soURzt r377JkckJ6BIGdnqAryWpnSGYoPwPlEFOX1ryi3PJSccNORwnvSEeasJsQBycXlt516D CVZGOZd2OsEZvKiJDh8KHgKb8/fqmHiWXYfly0ajFzoRJREwd9dE0w9XVO2f6duccC/I nIIKmnA4Yd5dg+6mzRm6JWxntZgaQFoI7mlyfZOr/Gnmxk9ppM9u0jT+wkjsKLjsJSV9 2dW8K4J5z3wIh2cr/cIVRlwZ1PRvJElwuWnfk9BrGW3RLmyicS+iSpDxx9mxQ1ygD9NI f8yg== X-Gm-Message-State: AOPr4FXkQ0f70UB7FwkjNgZ1NJr9CvO1iRKQswEabwGaAPjCL0qBx81xQpu7FiC0CUYFaA== X-Received: by 10.194.121.8 with SMTP id lg8mr21514399wjb.16.1462554854886; Fri, 06 May 2016 10:14:14 -0700 (PDT) Original-Received: from [192.168.0.185] (static-nbl2-118.cytanet.com.cy. [212.31.107.118]) by smtp.googlemail.com with ESMTPSA id lh1sm15962020wjb.20.2016.05.06.10.14.13 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 06 May 2016 10:14:14 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1 In-Reply-To: <3y1t5fkwl3.fsf@fencepost.gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22d 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:203649 Archived-At: On 05/06/2016 06:58 PM, Glenn Morris wrote: > > Please could somone fix the test/automated directory in master. Again. > This happens so often, it almost feels worth adding something to > gitmerge.el. I was going to do that later, but thanks to Paul for beating me to it. This is probably the last new test file in Emacs 25, and after the release development will branch off the next test structure.