On 01/22/2011 08:29 AM, Michael Lutz wrote:
Well, if you use both software that requires CRLF (though kdiff3 in my experience doesn't) and software that requires LF (bash) on the same files, there isn't much git can do to solve that conflict.
Software that *requires* CRLF should be taken out an shot! -- Andrew DeFaria <http://defaria.com> You cannot achieve the impossible without attempting the absurd.
-- Problem reports: http://cygwin.com/problems.html FAQ: http://cygwin.com/faq/ Documentation: http://cygwin.com/docs.html Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple
