Re: Retry conflicting merge with matching line endings?

On Tue, Feb 17, 2009 at 6:18 PM, Junio C Hamano [off-list ref] wrote:

This is not specific to fixing line ending but applies any "global token
replacement" (e.g. you renamed a variable) operation in general.

Thanks for the details. I was previously resolving things in a more
tedious manner and your steps will make things easier for me.

What I was curious about though is whether it would be reasonable for
me to submit a patch to have git automatically try this for the
special case of line endings (possibly implemented as a general token
replacement scheme with built-in filters for line endings)?