SourceGear Support

Could you check the status bar and see what character encoding DiffMerge selected for each file? In the right-most field, it should say something like "UTF-8(BOM)" or it may have 2 encodings with a ":" between them. Do these files have byte-order-marks (BOM) in them ? What are yo...

DiffMerge creates the __file__ tempfiles in the same directory as one of the files in the set. And this is hard-coded. (I just looked at the source and confirmed that there isn't an environment variable option to override that. Sorry.) However, the temp files are only created as backing for editing,...

What OS and version do you have ?
What version of DiffMerge do you have ?

thanks

Sorry, but this bug has not yet been fixed.
Unfortunately, I don't have an ETA for it that I can give you.

Sorry,
j

It means that there has been an edit on that line -- either interactive typing on the line or applying a change from the menu. It is just a little "activity" marker for the line. It doesn't mean that the line isn't the same as when it was loaded, but just that you've done something on that...

You might give http://retinizer.mikelpr.com/ a try. I haven't had
a chance to play with it yet, but one of our other developers just
used it on his new mac book and said it helped make the fonts less
murky.

jeff

Sorry, but this probably won't get addressed in the near term.
But I will log a request to investigate it.

jeff

You can modify or create a new "Ruleset" and customize it to meet your needs. A ruleset is chosen by file suffix. See the options/preferences dialog. There are predefined rulesets for several popular programming languages. Open an existing ruleset (or create a new one). In the "Edit R...

DiffMerge only supports editing in the right panel (of a 2 panel diff window). The left panel is read-only. We did it this way because the typical use was to have a historical/reference version on the left and the working/sandbox copy on the right and let you bring changes into the working copy. An ...

Do you remember what find-pattern you used ?
Sounds like I might need a quoting/escaping of the pattern before storing it
to prevent it from confusing the preference file format.

thanks

Yeah that error message could be a little more helpful and include the offending sequence. I'll log that. Are the files UTF-8 w/ or w/o byte-order-marks ? Or are they something else and just getting treated as-if they are UTF-8 ? You might try temporarily modifying the Ruleset for that suffix and se...

Sorry, but no that bug/feature has not been fixed yet.

Thanks for the feedback. I'll log a bug to investigate the new suffixes. WRT the color highlight, there is a dotted rectangle around the currently selected change. Granted, it is a little subtle, but it's there. I hesitate to introduce yet another set of colors into the mix -- I think I have too man...

I'll log that. Thanks!

jeff

On the "View" menu there are settings for 2, 4, and 8 space tabs.