From: Stefan-W. Hahn Date: Fri, 14 Feb 2014 16:47:09 GMT Subject: Re: Bug: Problem with CRLF line ending in git-diff with coloring Message-ID: <20140214164709.GI7560@pille.home> In-Reply-To: <20140209110155.GB16189@scotty.home> Mail von Stefan-W. Hahn, Sun, 09 Feb 2014 at 12:01:55 +0100: Good afternoon, I updated the test a little bit. Test 3 and 7 are going wrong. Both tests have a CRLF line ending in the changed line. I you redirect the output of the test to a file you see the main problem: ,---- | -+Zeile 22  | ++Zeile 22  `---- > It's the right solution. IOW, you should place something like this in > your .gitattributes: > *.html whitespace=cr-at-eol Sorry, but this is not possible, because I have files of both sorts (mainly C/C++) files in my repository and cannot change the files as I wish. With kind regards, Stefan -- Stefan-W. Hahn It is easy to make things. It is hard to make things simple.