From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: Trouble merging line-numbers branch into master Date: Fri, 7 Jul 2017 14:41:36 -0700 Organization: UCLA Computer Science Department Message-ID: <95b91e6b-c53e-c969-cda1-998803d301cc@cs.ucla.edu> References: <20170707212353.GA2428@acm> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1499463745 26887 195.159.176.226 (7 Jul 2017 21:42:25 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 7 Jul 2017 21:42:25 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 Cc: Emacs developers To: Alan Mackenzie , Kaushal Modi Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jul 07 23:42:20 2017 Return-path: 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 ) id 1dTb0w-0006Oy-LW for ged-emacs-devel@m.gmane.org; Fri, 07 Jul 2017 23:42:14 +0200 Original-Received: from localhost ([::1]:58913 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTb0z-00030n-64 for ged-emacs-devel@m.gmane.org; Fri, 07 Jul 2017 17:42:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48816) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTb0S-00030i-Ih for emacs-devel@gnu.org; Fri, 07 Jul 2017 17:41:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTb0N-0001Hc-L0 for emacs-devel@gnu.org; Fri, 07 Jul 2017 17:41:44 -0400 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:46334) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dTb0N-0001Gw-Ea for emacs-devel@gnu.org; Fri, 07 Jul 2017 17:41:39 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id EF2E6160161; Fri, 7 Jul 2017 14:41:37 -0700 (PDT) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id JIrZi7hw5nYA; Fri, 7 Jul 2017 14:41:37 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 503FC16016B; Fri, 7 Jul 2017 14:41:37 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id KBxHGM_vnGY4; Fri, 7 Jul 2017 14:41:37 -0700 (PDT) Original-Received: from [192.168.1.9] (unknown [47.153.184.153]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 2E9B2160168; Fri, 7 Jul 2017 14:41:37 -0700 (PDT) In-Reply-To: <20170707212353.GA2428@acm> Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 131.179.128.68 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:216293 Archived-At: Presumably the lines in question were changed in one branch or the other = (not=20 necessarily by messing with white space), and our git settings are sugges= ting=20 that you omit the spaces before tabs while you're futzing with those line= s. As build-aux/git-hooks/pre-commit suggests, you can work around the probl= em=20 temporarily with the shell command 'git config core.whitespace -trailing-= space'.=20 I don't recommend this setting in general, though.