From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#29916: 26.0.90; CRLF in diff-command output breaks smerge hunk header parsing Date: Wed, 03 Jan 2018 17:18:08 +0200 Message-ID: <83shbnas3z.fsf@gnu.org> References: <83y3lid8eg.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1514992644 6611 195.159.176.226 (3 Jan 2018 15:17:24 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 3 Jan 2018 15:17:24 +0000 (UTC) Cc: monnier@iro.umontreal.ca, 29916@debbugs.gnu.org To: Richard Copley Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jan 03 16:17:20 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1eWkn0-0000s8-Pp for geb-bug-gnu-emacs@m.gmane.org; Wed, 03 Jan 2018 16:17:10 +0100 Original-Received: from localhost ([::1]:55398 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWkoz-0006ti-Vs for geb-bug-gnu-emacs@m.gmane.org; Wed, 03 Jan 2018 10:19:14 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWkot-0006sp-MP for bug-gnu-emacs@gnu.org; Wed, 03 Jan 2018 10:19:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWkoo-000660-PM for bug-gnu-emacs@gnu.org; Wed, 03 Jan 2018 10:19:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:54056) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWkoo-00065m-M3 for bug-gnu-emacs@gnu.org; Wed, 03 Jan 2018 10:19:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eWkoo-000387-Gk for bug-gnu-emacs@gnu.org; Wed, 03 Jan 2018 10:19:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 03 Jan 2018 15:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 29916 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 29916-submit@debbugs.gnu.org id=B29916.151499270311981 (code B ref 29916); Wed, 03 Jan 2018 15:19:02 +0000 Original-Received: (at 29916) by debbugs.gnu.org; 3 Jan 2018 15:18:23 +0000 Original-Received: from localhost ([127.0.0.1]:34504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eWkoB-00037B-96 for submit@debbugs.gnu.org; Wed, 03 Jan 2018 10:18:23 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:43522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eWko8-00036y-K5 for 29916@debbugs.gnu.org; Wed, 03 Jan 2018 10:18:20 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWkny-0005LJ-9U for 29916@debbugs.gnu.org; Wed, 03 Jan 2018 10:18:15 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:60065) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWkny-0005L1-6G; Wed, 03 Jan 2018 10:18:10 -0500 Original-Received: from [176.228.60.248] (port=2152 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1eWknx-0000Zm-PG; Wed, 03 Jan 2018 10:18:10 -0500 In-reply-to: (message from Richard Copley on Tue, 2 Jan 2018 21:41:03 +0000) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:141748 Archived-At: > From: Richard Copley > Date: Tue, 2 Jan 2018 21:41:03 +0000 > Cc: Eli Zaretskii , 29916@debbugs.gnu.org > > Eli, will you make the change please? Will do.