From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!.POSTED!not-for-mail
From: Stefan Monnier <monnier@iro.umontreal.ca>
Newsgroups: gmane.emacs.devel
Subject: Re: Trouble merging line-numbers branch into master
Date: Fri, 07 Jul 2017 17:38:00 -0400
Message-ID: <jwvfue8j5dj.fsf-monnier+gmane.emacs.devel@gnu.org>
References: <CAFyQvY0N4UuNfPQW48JgFb8nt_2pFz80u_h_mHATYKiYCg7AqA@mail.gmail.com>
	<20170707212353.GA2428@acm>
NNTP-Posting-Host: blaine.gmane.org
Mime-Version: 1.0
Content-Type: text/plain
X-Trace: blaine.gmane.org 1499463505 15110 195.159.176.226 (7 Jul 2017 21:38:25 GMT)
X-Complaints-To: usenet@blaine.gmane.org
NNTP-Posting-Date: Fri, 7 Jul 2017 21:38:25 +0000 (UTC)
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux)
To: emacs-devel@gnu.org
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jul 07 23:38:22 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 1dTaxB-0003hK-8I
	for ged-emacs-devel@m.gmane.org; Fri, 07 Jul 2017 23:38:21 +0200
Original-Received: from localhost ([::1]:58905 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 1dTaxG-0001de-L7
	for ged-emacs-devel@m.gmane.org; Fri, 07 Jul 2017 17:38:26 -0400
Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47622)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ged-emacs-devel@m.gmane.org>) id 1dTaxA-0001dW-7M
	for emacs-devel@gnu.org; Fri, 07 Jul 2017 17:38:21 -0400
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ged-emacs-devel@m.gmane.org>) id 1dTax7-0007Uq-48
	for emacs-devel@gnu.org; Fri, 07 Jul 2017 17:38:20 -0400
Original-Received: from [195.159.176.226] (port=54325 helo=blaine.gmane.org)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <ged-emacs-devel@m.gmane.org>)
	id 1dTax6-0007U4-TS
	for emacs-devel@gnu.org; Fri, 07 Jul 2017 17:38:17 -0400
Original-Received: from list by blaine.gmane.org with local (Exim 4.84_2)
	(envelope-from <ged-emacs-devel@m.gmane.org>) id 1dTawv-00030I-F7
	for emacs-devel@gnu.org; Fri, 07 Jul 2017 23:38:05 +0200
X-Injected-Via-Gmane: http://gmane.org/
Original-Lines: 10
Original-X-Complaints-To: usenet@blaine.gmane.org
Cancel-Lock: sha1:SU+2yo2hOBckJq8hAEnIHK8lWrs=
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
	[fuzzy]
X-Received-From: 195.159.176.226
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:216292
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/216292>

> Have you any idea what's special about those two <space><tab>s in
> cc-fonts.el that git complained about them, but not the other 2056
> occurrences?

These occurrences were in lines that have been touched somehow by
the merge: the check only looks at text lines that are modified.



        Stefan