From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 24 Aug 2008 00:56:56 GMT
Subject: Re: [PATCH (BUGFIX)] Respect core.autocrlf in combined diff
Message-ID: <7vej4fw7qf.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <200808232321.21795.angavrilov@gmail.com>

Alexander Gavrilov <angavrilov@gmail.com> writes:

> 	Steps to reproduce:
>
> 		git init
> 		echo foo > file
> 		git add file
> 		git commit -m init
> 		git checkout -b a
> 		git checkout -b b
> 		echo bbb >> file
> 		git add file
> 		git commit -m bbb
> 		git checkout a
> 		echo aaa >> file
> 		git add file
> 		git commit -m aaa
> 		git config core.autocrlf true
> 		git merge b

Please add this kind of sequence to test scripts.

The patch from a cursory look appears correct.  Thanks.