Is there anything built-in to ToitoiseSvn or TortoiseMerge that I’m missing ? Or any existing plug-in that I might consider using ?īNCS Engineer, SI SOL Telco & Media Vertical Practice I’ve found the “Advanced diff settings” page where plugins are configured for Word/Excel etc but there is no sign of anything I notice that there is some filetype specific selection of differencing that is used for MS Word files, for example. Is there a feature for doing this within TortoiseSvn/TortoiseMerge ?

WinMerge comes with some filters to normalize irrelevant differencesīetween files so this issue can be worked around (though the filters do prevent these file-types being merged). With CVSNT I’ve used WinMerge for showing differences. I have come fairly recently to Subversion and TortoiseSvn and TortoieMerge, having used CVSNT/CVS Suite for many years. On looking at XML files in TortoiseMerge I am seeing these irrelevant differences and it is making it very difficult to spot real changes, either to plan my commit, or to do a merge. Two XML files might appear from a straightforward text diff to be quite different, but to an XML-aware differencer When differencing some file-types, eg XML, whitespace and some details of the syntax don’t actually mean a significant difference.

Winmerge filter syntax