Subject: Re: [PATCH] Documentation/git-merge.txt: Expand the How Merge Works section

From: Petr Baudis <[email-masked]>
Date: Thu, 17 Jul 2008 18:42:19 +0200

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