Feature Request -EOL Detection / EditorConfig support

Support for our DiffMerge utility.

Moderator: SourceGear

Post Reply
Posts: 1
Joined: Tue Sep 18, 2012 10:29 am

Feature Request -EOL Detection / EditorConfig support

Post by Iristyle » Tue Sep 18, 2012 10:38 am

I'm doubtful you'll be able to support EditorConfig any time soon - http://editorconfig.org/ -- but would certainly like to see it happen.

In the interim however, it appears that using Windows DiffMerge 3.3.1 does not respect the original file line ending and saves a file with CRLF, even if the source file had LF endings. Obviously, this isn't a good thing, because now I have to make sure to touch the file in an editor that supports EditorConfig to undo the bungled line endings.

I'm using DiffMerge as my default merge tool with Git, and working on a web project developed across OSes that uses LF line endings.

I didn't see anything, but please let me know if I've missed an option, command line arg, or similar.


Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear

Re: Feature Request -EOL Detection / EditorConfig support

Post by jeffhostetler » Wed Sep 19, 2012 8:30 am

I had not heard of the editorconfig.org project before. I'll look it up. Thanks.

DiffMerge is supposed to respect the line endings and use the convention that
it sees in the file. Turn on the "show invisibles" (on the View menu) and confirm
that DiffMerge is getting the files from GIT with just LFs as you're expecting.
(It could be that GIT is doing the LF => CRLF before launching DiffMerge, for


Post Reply