Diffmerge is incorrectly ignoring whitespace in literal strings causing the checkin of these changes to abort because it detects no change. Are you aware of this problem? Is there a fix on the way?

How do we work around it? Do all of our developers need to change their individual setups?

Thanks for the pointer, but isn't it a bug if it is discarding or ignoring whitespace between quotatioins or within literal strings?

No, you are correct. I misunderstood our developer and thought that it was preventing the checkin because it didn't detect a difference. When in reality the developer was preventing the checkin because diffmerge was not detecting the whitespace he/she had added to the literal string.

So is this something that is going to get fixed in diffmerge? What if you really DO want to ignore whitespace but not within literal strings?

Thanks for your help.