SourceGear Support

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...

It is on my bug list, but no I haven't had opportunity to fix it.
Sorry.
jeff

Thanks for the suggestions. I'll take another look at the other products and see what I can do. But it'll be a while before I have anything to show. (And you're right, no algorithm is good enough to catch/guess the right answer in all cases, so this is something I definitely need to improve in the p...

We don't currently have a non-gui version of merge as you describe. It would be nice to be able to do that though. I'll log a feature request for this. What you might do until then is have a little shell script that runs a command line tool like GNU diff3 and checks the error code and then if it rep...

Yeah, that would be a good thing to do.
I'll log that.

thanks,
jeff

W0290

Unless I'm misunderstanding your question, 3-way comparisons have always been available in DiffMerge. The "Open File Merge..." menu item and the "Open Merge Window" toolbar button will let you do that. They will open a dialog that lets you pick 3 versions of a file and show them ...

Thanks for the note. I'll log a request for an rsync-mode.

jeff

It's on the list, but I've not had a chance to work on it.
To be honest, it's not likely that I'll get to it any time soon.

Sorry,
jeff

The ability to do various file operations from the folder diff window
is on my TODO list. And yeah, they'd be really nice to have.
But unfortunately, I haven't gotten to them yet.

Sorry,
jeff

It took a little tinkering but I was able to reproduce what you're seeing. I've logged this. I do have a work around that should make the issue go away. On the "Detail Level" page of the Options/Preferences Dialog, select "Simple" rather than "Complex" on the second set...

Correct, DiffMerge still only allow editing in the right panel (and in the middle panel of a merge window).
This is only my list, but hasn't made it to the top yet.

Sorry,
jeff

I thought I had fixed that.

Doesn't the error dialog report that?
jeff

sorry, but no.

the command line diff option only handles a pair of files.

jeff

Let me ask a few questions and get some info from you and then we'll see if we can't figure out what is wrong. Which version of DiffMerge do you have and which version of Mac OS do you have? Was it working before? Did anything change in your environment when it stopped working? Does it fail when you...

sorry, but no, not at this time.
It is on the list, but I can't say
yet when I will be able to get
to it.

jeff