linux-mips
[Top] [All Lists]

Re: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/g

To: linux-mips@linux-mips.org
Subject: Re: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
From: Jan-Benedict Glaw <jbglaw@lug-owl.de>
Date: Thu, 3 Aug 2006 19:52:26 +0200
In-reply-to: <S8133924AbWHCQmm/20060803164242Z+747@ftp.linux-mips.org>
Mail-followup-to: linux-mips@linux-mips.org
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <S8133924AbWHCQmm/20060803164242Z+747@ftp.linux-mips.org>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mutt/1.5.9i
On Thu, 2006-08-03 17:42:34 +0100, linux-mips@linux-mips.org 
<linux-mips@linux-mips.org> wrote:
> diff --git a/.gitignore b/.gitignore
> index 5535e8b..d272b10 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -30,12 +30,15 @@ include/config
>  include/linux/autoconf.h
>  include/linux/compile.h
>  include/linux/version.h
> +<<<<<<< HEAD/.gitignore
>  include/asm-*/asm-offsets.h
> +=======
> +include/linux/utsrelease.h
> +>>>>>>> 3f2792ffbd88dc1cd41d226674cc428914981e98/.gitignore

[...]

I think you may want to fix this :)

MfG, JBG

-- 
       Jan-Benedict Glaw       jbglaw@lug-owl.de                +49-172-7608481
Signature of:           "really soon now":       an unspecified period of time, 
likly to
the second  :                                    be greater than any reasonable 
definition
                                                 of "soon".

Attachment: signature.asc
Description: Digital signature

<Prev in Thread] Current Thread [Next in Thread>
  • Re: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6, Jan-Benedict Glaw <=