From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: smerge autolaunch integration for conflicts in git Date: Wed, 20 Aug 2014 16:46:31 -0400 Message-ID: References: <20140813091310.A2525380604@snark.thyrsus.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1408567629 11408 80.91.229.3 (20 Aug 2014 20:47:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 20 Aug 2014 20:47:09 +0000 (UTC) Cc: emacs-devel@gnu.org To: esr@thyrsus.com (Eric S. Raymond) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 20 22:47:04 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 1XKCme-0001ip-BV for ged-emacs-devel@m.gmane.org; Wed, 20 Aug 2014 22:47:04 +0200 Original-Received: from localhost ([::1]:57487 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKCmd-0008TS-Sv for ged-emacs-devel@m.gmane.org; Wed, 20 Aug 2014 16:47:03 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39877) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKCm9-0008BB-FV for emacs-devel@gnu.org; Wed, 20 Aug 2014 16:46:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XKCm8-0007ET-Gp for emacs-devel@gnu.org; Wed, 20 Aug 2014 16:46:33 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:44288) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKCm8-0007EO-Eg for emacs-devel@gnu.org; Wed, 20 Aug 2014 16:46:32 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1XKCm7-0002hW-PR; Wed, 20 Aug 2014 16:46:31 -0400 X-Spook: Fortezza electronic surveillance ASIO S Box M-14 SRI X-Ran: @c,D1t[U$3:\O&oTz[sXtqOKYE3Mn9}p&!L!'p9)yfOnf|t_;u8)ht7uJ>q75?#'^%r6(^ X-Hue: yellow X-Attribution: GM In-Reply-To: <20140813091310.A2525380604@snark.thyrsus.com> (Eric S. Raymond's message of "Wed, 13 Aug 2014 05:13:10 -0400 (EDT)") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:173784 Archived-At: The comments from http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01126.html are still applicable.