Ignoring Whitespace in merge operations

[GregM]

I discovered today that the Diff/Merge tool is set to ignore whitespace differences by default. Now, that's not necessarily a bad thing for a Diff tool, but it's not a good thing to be doing when merging. I've had to manually fix the whitespace in many files because of this switch.

Since we use BeyondCompare for doing differences, it's not a big deal that this switch is shared between diff and merge, but I imagine that other users would want/need these settings to be separate.

[jclausius]

I discovered today that the Diff/Merge tool is set to ignore whitespace differences by default.

If anyone wants to change this behavior within SourceGear's Diff/Merge tool, this setting is controlled in the Tools -> Options dialog. Look for "Ignore Differences in Whitespace" in the File Comparison section.