From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Aug 2010 16:39:41 GMT
Subject: Re: [PATCH 4/4] merge-recursive: options to ignore whitespace changes
Message-ID: <7viq2xmipe.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20100826055147.GG9708@burratino>

Jonathan Nieder <jrnieder@gmail.com> writes:

> From: Justin Frankel <justin@cockos.com>
>
> Add support for merging with ignoring line endings (specifically
> --ignore-space-at-eol) when using recursive merging.  This is
> as a strategy-option, so that you can do:

"This is as a strategy-option"?  s/is/& done/ perhaps?

Otherwise looks good to me.