SVN error: cannot show diff because of inconsistent of newline in the file

I used svn to compare the configuration file today. An error message is displayed, so I cannot execute the diff command to view and compare it.

Error message content:

SVN error: cannot show diff because of inconsistent of newline in the file

Later, I went to search and view to find out the cause:

Sometimes when comparing two files, the above error is caused by different line feed formats.

The cause of the error is that TortoiseMerge, a comparison tool provided by TortoiseSVN, cannot handle different line feed formats currently.

 

Therefore, I submitted a copy of the experiment, modified it, and performed the diff operation, which is indeed smooth. Then return to the version that cannot be compared at the beginning. Check it.

In the previous version, each row is CR, LF, and the other is CR, missing LF.

The original post address of the Forum responded by this expert is:

Http://topic.csdn.net/u/20111214/13/a9cc61d6-a74b-4d2b-a53f-7b7c2f04d3b0.html