Re: [PATCH 4/4] merge-recursive: options to ignore whitespace changes

Jonathan Nieder [off-list ref] writes:

From: Justin Frankel <redacted>

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.