From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miklos Vajna Subject: Re: [PATCH] Add new test to ensure git-merge handles pull.twohead and pull.octopus Date: Sun, 29 Jun 2008 17:11:24 +0200 Message-ID: <20080629151124.GQ2058@genesis.frugalware.org> References: <48678E90.1030608@free.fr> <1214751098-547-1-git-send-email-vmiklos@frugalware.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="W4pDZ/VvazBYHhxQ" Cc: Junio C Hamano , git@vger.kernel.org, Johannes Schindelin To: Olivier Marin X-From: git-owner@vger.kernel.org Sun Jun 29 17:13:08 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 1KCyaO-0001dV-Rt for gcvg-git-2@gmane.org; Sun, 29 Jun 2008 17:13:05 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760570AbYF2PLc (ORCPT ); Sun, 29 Jun 2008 11:11:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760747AbYF2PLc (ORCPT ); Sun, 29 Jun 2008 11:11:32 -0400 Received: from virgo.iok.hu ([193.202.89.103]:41220 "EHLO virgo.iok.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760411AbYF2PLb (ORCPT ); Sun, 29 Jun 2008 11:11:31 -0400 Received: from kag.elte.hu (kag.elte.hu [157.181.177.1]) by virgo.iok.hu (Postfix) with ESMTP id 39B2D1B2500; Sun, 29 Jun 2008 17:11:27 +0200 (CEST) Received: from genesis.frugalware.org (frugalware.elte.hu [157.181.177.34]) by kag.elte.hu (Postfix) with ESMTP id C671B44668; Sun, 29 Jun 2008 16:43:39 +0200 (CEST) Received: by genesis.frugalware.org (Postfix, from userid 1000) id A7B0C11901F0; Sun, 29 Jun 2008 17:11:24 +0200 (CEST) Content-Disposition: inline In-Reply-To: <1214751098-547-1-git-send-email-vmiklos@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: --W4pDZ/VvazBYHhxQ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sun, Jun 29, 2008 at 04:51:38PM +0200, Miklos Vajna wrote: > Signed-off-by: Junio C Hamano Oops, I forgot to remove this Signed-off-by. Fixed in my fork. --W4pDZ/VvazBYHhxQ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkhnphwACgkQe81tAgORUJbCqACgnem13qIBXzImzio2ZGKQT9v0 H4IAnA6SE5lkPqZNr1GwI0XwaordAN9c =pTd7 -----END PGP SIGNATURE----- --W4pDZ/VvazBYHhxQ--