Author Topic: Option to suppress git EOL chars do not match popup  (Read 328 times)

Marcel

  • Senior Community Member
  • Posts: 172
  • Hero Points: 14
Option to suppress git EOL chars do not match popup
« on: March 05, 2018, 03:59:29 pm »
I complained about this some time ago, and want to bring it back up.   When I do a git version control diff against the most up to date version (or any other version, for that matter), SE pops up an EOL mismatch warning.  I would like to have an option to suppress this warning, as I am doing this a few dozen times a day, and don't want SE to compare line endings. Better yet, fix the extracted file. My checked out file has Windows CR/LF endings, so the file pulled out of the git blob for the diff has probably LF endings.

Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2106
  • Hero Points: 105
Re: Option to suppress git EOL chars do not match popup
« Reply #1 on: March 06, 2018, 12:55:47 pm »
There is an option to never compare EOL chars.  Would that work for you?

Marcel

  • Senior Community Member
  • Posts: 172
  • Hero Points: 14
Re: Option to suppress git EOL chars do not match popup
« Reply #2 on: March 06, 2018, 03:01:12 pm »
Probably, but I don't how to feed that option into vsdiff, it the git version compare feature going to do that?

Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2106
  • Hero Points: 105
Re: Option to suppress git EOL chars do not match popup
« Reply #3 on: March 06, 2018, 03:09:33 pm »
If you set that as the option from inside the editor, it will use those settings when you compare with git.

Marcel

  • Senior Community Member
  • Posts: 172
  • Hero Points: 14
Re: Option to suppress git EOL chars do not match popup
« Reply #4 on: March 06, 2018, 03:17:37 pm »
Tools -> File Difference, then modify the options, save and cancel out.

That works, thanks Dan!