From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] trunk r117697: Integrate =?windows-1252?Q?R=FCd?= =?windows-1252?Q?iger?= Sonderfeld's code for detecting conflicted files under git. Date: Wed, 13 Aug 2014 09:00:08 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1407934837 5471 80.91.229.3 (13 Aug 2014 13:00:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 13 Aug 2014 13:00:37 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eric S. Raymond Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 13 15:00:30 2014 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 1XHYAI-0000V3-Eu for ged-emacs-devel@m.gmane.org; Wed, 13 Aug 2014 15:00:30 +0200 Original-Received: from localhost ([::1]:47304 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHYAI-0000nP-0y for ged-emacs-devel@m.gmane.org; Wed, 13 Aug 2014 09:00:30 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHYA5-0000m0-EI for emacs-devel@gnu.org; Wed, 13 Aug 2014 09:00:25 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHY9x-0002Kc-SC for emacs-devel@gnu.org; Wed, 13 Aug 2014 09:00:17 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:25238) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHY9x-0002KW-P8 for emacs-devel@gnu.org; Wed, 13 Aug 2014 09:00:09 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArgGAIDvNVPAqyKr/2dsb2JhbABZgwaDSsAzAQmBFxd0giUBAQEBAgFWIwULCzQHCxQYDSSIBAjSGReORzMHhDgEqwOBcYFbIQ X-IPAS-Result: ArgGAIDvNVPAqyKr/2dsb2JhbABZgwaDSsAzAQmBFxd0giUBAQEBAgFWIwULCzQHCxQYDSSIBAjSGReORzMHhDgEqwOBcYFbIQ X-IronPort-AV: E=Sophos;i="4.97,753,1389762000"; d="scan'208";a="86631099" Original-Received: from 192-171-34-171.cpe.pppoe.ca (HELO pastel.home) ([192.171.34.171]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 13 Aug 2014 09:00:09 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id DC6CF6056D; Wed, 13 Aug 2014 09:00:08 -0400 (EDT) In-Reply-To: (Eric S. Raymond's message of "Wed, 13 Aug 2014 08:06:55 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:173622 Archived-At: > message: > Integrate R=FCdiger Sonderfeld's code for detecting conflicted files un= der git. Please use the same text for the VCS commit message as the one in the ChangeLog (C-c C-a in *VC-Log* will do it for you). Stefan