Ignoring Whitespace in merge operations

This forum is now locked, since Gold Support is no longer offered.

Moderator: SourceGear

Locked
GregM
Posts: 485
Joined: Sat Mar 13, 2004 9:00 am

Ignoring Whitespace in merge operations

Post by GregM » Fri Mar 25, 2005 9:24 am

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
Posts: 3660
Joined: Tue Dec 16, 2003 1:17 pm
Location: SourceGear
Contact:

Re: Ignoring Whitespace in merge operations

Post by jclausius » Fri Mar 25, 2005 9:48 am

GregM wrote: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.
Jeff Clausius
SourceGear

Locked