From mboxrd@z Thu Jan  1 00:00:00 1970
From: Petr Baudis <pasky@suse.cz>
Subject: Re: [PATCH] Documentation/git-merge.txt: Expand the How Merge
	Works section
Date: Thu, 17 Jul 2008 18:42:19 +0200
Message-ID: <20080717164219.GX32184@machine.or.cz>
References: <20080717162922.12081.96582.stgit@localhost>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: git@vger.kernel.org
To: gitster@pobox.com
X-From: git-owner@vger.kernel.org Thu Jul 17 18:43:23 2008
Return-path: <git-owner@vger.kernel.org>
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 1KJWZc-000114-MP
	for gcvg-git-2@gmane.org; Thu, 17 Jul 2008 18:43:21 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755746AbYGQQmW (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Thu, 17 Jul 2008 12:42:22 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755050AbYGQQmW
	(ORCPT <rfc822;git-outgoing>); Thu, 17 Jul 2008 12:42:22 -0400
Received: from w241.dkm.cz ([62.24.88.241]:48703 "EHLO machine.or.cz"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752105AbYGQQmV (ORCPT <rfc822;git@vger.kernel.org>);
	Thu, 17 Jul 2008 12:42:21 -0400
Received: by machine.or.cz (Postfix, from userid 2001)
	id DAD182C4C027; Thu, 17 Jul 2008 18:42:19 +0200 (CEST)
Content-Disposition: inline
In-Reply-To: <20080717162922.12081.96582.stgit@localhost>
User-Agent: Mutt/1.5.16 (2007-06-09)
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/88879>

On Thu, Jul 17, 2008 at 06:29:32PM +0200, Petr Baudis wrote:
>  foo                         |    1 
>  2 files changed, 59 insertions(+), 35 deletions(-)
>  create mode 100644 foo

*Cough* Sorry about this. I think there is currently no need to merge
the 'foo' bit. ;-)

				Petr "Pasky" Baudis