Jonathan Nieder <jrnieder@xxxxxxxxx> writes: > From: Justin Frankel <justin@xxxxxxxxxx> > > 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html