From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jan Nieuwenhuizen Newsgroups: gmane.emacs.devel Subject: Re: Bazaar to Git status Date: Sun, 10 Aug 2014 17:40:49 +0200 Organization: AvatarAcademy.nl Message-ID: <8761i02vzy.fsf@drakenvlieg.flower> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1407685324 4226 80.91.229.3 (10 Aug 2014 15:42:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 10 Aug 2014 15:42:04 +0000 (UTC) Cc: Paul Michael Reilly , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Aug 10 17:41:59 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 1XGVFt-0003Cr-4j for ged-emacs-devel@m.gmane.org; Sun, 10 Aug 2014 17:41:57 +0200 Original-Received: from localhost ([::1]:60093 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGVFs-0006D2-NT for ged-emacs-devel@m.gmane.org; Sun, 10 Aug 2014 11:41:56 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGVFl-0006Cu-Jz for emacs-devel@gnu.org; Sun, 10 Aug 2014 11:41:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XGVFg-0000pA-Ol for emacs-devel@gnu.org; Sun, 10 Aug 2014 11:41:49 -0400 Original-Received: from smtp-vbr1.xs4all.nl ([194.109.24.21]:2951) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XGVFg-0000p5-G3 for emacs-devel@gnu.org; Sun, 10 Aug 2014 11:41:44 -0400 Original-Received: from drakenvlieg.flower.peder.onsbrabantnet.nl (static.kpn.net [92.70.116.82] (may be forged)) (authenticated bits=0) by smtp-vbr1.xs4all.nl (8.13.8/8.13.8) with ESMTP id s7AFeoJv082016 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sun, 10 Aug 2014 17:41:04 +0200 (CEST) (envelope-from janneke@gnu.org) X-Url: http://AvatarAcademy.nl In-Reply-To: (Stefan Monnier's message of "Sun, 10 Aug 2014 11:26:07 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-Virus-Scanned: by XS4ALL Virus Scanner X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 194.109.24.21 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:173546 Archived-At: Stefan Monnier writes: > Reminds me that, additionally to the "not before the 24.4 release", > we're also still waiting for Git support of vc-find-conflicted-file. "waiting", is that an effective strategy? Greetings, Jan --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.nl= =20=20