From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!.POSTED!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: master has switched from Automake to GNU Make
Date: Sun, 26 Mar 2017 17:31:29 +0300
Message-ID: <83o9wo9kji.fsf@gnu.org>
References: <58CB9F6B.5080806@gmx.at> <83h92sz2j9.fsf@gnu.org>
	<58CBAEB7.5030601@gmx.at>
	<d8c602f6-e0ad-ad59-62cb-3e700665e4c0@cs.ucla.edu>
	<58CBBC6C.8000104@gmx.at>
	<e0547168-5dac-7992-7c1c-f48e821236da@cs.ucla.edu>
	<b651d63f-f526-2e33-d526-4f983ee01e51@cs.ucla.edu>
	<58D380FF.1070103@gmx.at>
	<jwvr31ojk42.fsf-monnier+gmane.emacs.devel@gnu.org>
	<58D3C84E.5080808@gmx.at> <jwvvar02eaz.fsf-monnier+emacs@gnu.org>
	<58D4E0D6.2070101@gmx.at> <86mvcap85t.fsf@stephe-leake.org>
	<58D637CD.1020902@gmx.at>
	<60eced11-9b48-f24d-88d7-cacb211418c9@cs.ucla.edu>
	<58D77E12.2060805@gmx.at> <86r31k5gxm.fsf@stephe-leake.org>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: blaine.gmane.org
X-Trace: blaine.gmane.org 1490538751 14750 195.159.176.226 (26 Mar 2017 14:32:31 GMT)
X-Complaints-To: usenet@blaine.gmane.org
NNTP-Posting-Date: Sun, 26 Mar 2017 14:32:31 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Stephen Leake <stephen_leake@stephe-leake.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 26 16:32:28 2017
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane.org
Original-Received: from lists.gnu.org ([208.118.235.17])
	by blaine.gmane.org with esmtp (Exim 4.84_2)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1cs9DX-0003SD-K6
	for ged-emacs-devel@m.gmane.org; Sun, 26 Mar 2017 16:32:27 +0200
Original-Received: from localhost ([::1]:41201 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1cs9Dd-0006FN-EK
	for ged-emacs-devel@m.gmane.org; Sun, 26 Mar 2017 10:32:33 -0400
Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54550)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1cs9Ce-0006E5-8z
	for emacs-devel@gnu.org; Sun, 26 Mar 2017 10:31:33 -0400
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1cs9Cd-0002ck-K1
	for emacs-devel@gnu.org; Sun, 26 Mar 2017 10:31:32 -0400
Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:39322)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1cs9Cd-0002ce-GY; Sun, 26 Mar 2017 10:31:31 -0400
Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:2708
	helo=home-c4e4a596f7)
	by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256)
	(Exim 4.82) (envelope-from <eliz@gnu.org>)
	id 1cs9Cc-0001EJ-Rq; Sun, 26 Mar 2017 10:31:31 -0400
In-reply-to: <86r31k5gxm.fsf@stephe-leake.org> (message from Stephen Leake on
	Sun, 26 Mar 2017 08:03:01 -0500)
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." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel/>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Original-Sender: "Emacs-devel" <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Xref: news.gmane.org gmane.emacs.devel:213366
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/213366>

> From: Stephen Leake <stephen_leake@stephe-leake.org>
> Date: Sun, 26 Mar 2017 08:03:01 -0500
> 
> > It might be related to the fact that I use git entirely from within
> > Emacs, git tells me that my terminal is dumb and explicitly asks me to
> > commit what I pulled even when there were no conflicts.  
> 
> That sounds like line ending mismatch.

On Unix? unlikely.