From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.176.0/21 X-Spam-Status: No, score=-3.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 From: Shawn Pearce Subject: Re: svn versus git Date: Thu, 14 Dec 2006 17:23:01 -0500 Message-ID: <20061214222301.GB26202@spearce.org> References: <200612132200.41420.andyparkins@gmail.com> <200612142000.54409.arekm@maven.pl> <4581CB38.8050401@op5.se> <200612142313.27741.arekm@maven.pl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii NNTP-Posting-Date: Thu, 14 Dec 2006 22:23:19 +0000 (UTC) Cc: Andreas Ericsson , Andy Parkins , git@vger.kernel.org Return-path: Envelope-to: gcvg-git@gmane.org Content-Disposition: inline In-Reply-To: <200612142313.27741.arekm@maven.pl> User-Agent: Mutt/1.5.11 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - corvette.plexpod.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [0 0] / [47 12] X-AntiAbuse: Sender Address Domain - spearce.org X-Source: X-Source-Args: X-Source-Dir: Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Received: from vger.kernel.org ([209.132.176.167]) by dough.gmane.org with esmtp (Exim 4.50) id 1Guyyu-0001cJ-Gi for gcvg-git@gmane.org; Thu, 14 Dec 2006 23:23:12 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964910AbWLNWXJ (ORCPT ); Thu, 14 Dec 2006 17:23:09 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964925AbWLNWXJ (ORCPT ); Thu, 14 Dec 2006 17:23:09 -0500 Received: from corvette.plexpod.net ([64.38.20.226]:39142 "EHLO corvette.plexpod.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964910AbWLNWXI (ORCPT ); Thu, 14 Dec 2006 17:23:08 -0500 Received: from cpe-74-70-48-173.nycap.res.rr.com ([74.70.48.173] helo=asimov.home.spearce.org) by corvette.plexpod.net with esmtpa (Exim 4.52) id 1Guyyc-00072P-Nt; Thu, 14 Dec 2006 17:22:54 -0500 Received: by asimov.home.spearce.org (Postfix, from userid 1000) id 3CCA320FB65; Thu, 14 Dec 2006 17:23:02 -0500 (EST) To: Arkadiusz Miskiewicz Sender: git-owner@vger.kernel.org Arkadiusz Miskiewicz wrote: > > We no longer require external merge tools. > Starting from which version? Not released yet, its sitting in 'next'. Hopefully 1.5. --