Whitespace conflicts during merges

I often find myself cleaning whitespace in code, then using TSVN to
update my working copy and having conflicts on the lines I've modified
whitespace (because someone else modified whitespace too).

I know that I can set the diff viewer (and merge program) to ignore
whitespace differences, but is there any way to tell TSVN to ignore
whitespace differences when performing merges during a working copy update?

In the command-line tools, there is a '--diff3-cmd' option to specify a
merge command. I suspect I could use that to provide a merge command
that ignored whitespace differences during the merge. I was hoping TSVN
could provide something similar.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2847925

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-09-29 19:37:43 CEST