[TSVN] Edit Conflicts and Ignore Whitespace

I have run into a bit of a problem with the "Ignore Whitespace" options
in TortoiseMerge. If you have one of the two options set and then do an
update that creates a conflict because of whitespace, TortoiseMerge won't
show you the conflict at all.

I imagine this applies to all versions since the introduction of the
ignore whitespace options, but I have noticed this behavior in a few
different nightly builds over the last month or so.

I think it would be optimal if you could leave the ignore whitespace
option on for most of the file, but still see the differences in the
conflicted areas.

Thanks,
Josha Foust

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed May 18 18:59:18 2005