How can I disable diff in line separators in IntelliJ IDEA?

后端 未结 5 1041
失恋的感觉
失恋的感觉 2021-02-04 02:00

I\'m using Intellij IDEA 14 on Windows and Git as VCS on Unix server. The line separator in Windows is CLRF (\\r\\n) and LF (\\n) in Unix. In Git, I\'m

5条回答
  •  孤城傲影
    2021-02-04 02:32

    In Intellij 17.3, you can select in the "Compare by" combobox in the compare window whether you want to compare 'Binary content' or 'Text'. In the second case CRLF and LF are not shown as "different".

提交回复
热议问题