I just installed WinMerge on my windows machine. When doing setup it asked if I would like to use WinMerge in conjunction with tortoise svn. The link here sort of describes that func开发者_JS百科tionality.
http://manual.winmerge.org/VersionControl.html
I really don't like this as I cannot do a normal tortoise svn diff....
Any idea how to remove this option? I cannot find anything in the options menu or any other menu
Look in the tortoise options. There is an option to choose which diff tool you use.
TortoiseSVN Settings -> Diff Viewer -> Select 'TortoiseMerge'
精彩评论