From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miklos Vajna Subject: Re: [PATCH 6/6] Add a new test for using a custom merge strategy Date: Tue, 29 Jul 2008 02:01:04 +0200 Message-ID: <20080729000104.GS32057@genesis.frugalware.org> References: <20080728235847.GR32057@genesis.frugalware.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="s49/7BKZxGEZQag2" Cc: git@vger.kernel.org To: Johannes Schindelin X-From: git-owner@vger.kernel.org Tue Jul 29 02:02:29 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KNcfQ-0001U5-SX for gcvg-git-2@gmane.org; Tue, 29 Jul 2008 02:02:17 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752339AbYG2ABI (ORCPT ); Mon, 28 Jul 2008 20:01:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751860AbYG2ABG (ORCPT ); Mon, 28 Jul 2008 20:01:06 -0400 Received: from virgo.iok.hu ([193.202.89.103]:58860 "EHLO virgo.iok.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752262AbYG2ABF (ORCPT ); Mon, 28 Jul 2008 20:01:05 -0400 Received: from kag.elte.hu (kag.elte.hu [157.181.177.1]) by virgo.iok.hu (Postfix) with ESMTP id 76A831B2526; Tue, 29 Jul 2008 02:01:04 +0200 (CEST) Received: from genesis.frugalware.org (frugalware.elte.hu [157.181.177.34]) by kag.elte.hu (Postfix) with ESMTP id D5D434465E; Tue, 29 Jul 2008 01:16:41 +0200 (CEST) Received: by genesis.frugalware.org (Postfix, from userid 1000) id 35B491190A0A; Tue, 29 Jul 2008 02:01:04 +0200 (CEST) Content-Disposition: inline In-Reply-To: <20080728235847.GR32057@genesis.frugalware.org> User-Agent: Mutt/1.5.17 (2007-11-01) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: --s49/7BKZxGEZQag2 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Jul 29, 2008 at 01:58:47AM +0200, Miklos Vajna wrote: > So I guess my original patch was right, then. s/patch/description/. The check for the same trees are still valid. --s49/7BKZxGEZQag2 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkiOXcAACgkQe81tAgORUJZvfACeJ2lcXXEWZU/+RNqUBM619ou9 4GQAnj0Ln66gqyK1TumGTNgMNAsYXULf =1Q04 -----END PGP SIGNATURE----- --s49/7BKZxGEZQag2--