Using Tortoise SVN diff in TFS

Question

I want to use Tortoise SVN diff utility with TFS. I know how to configure user tools in TFS. What I need is installer for Tortoise SVN diff utility. I think I need to install full Tortoise SVN to get SVN diff tool, is there a standalone version of this tool available for download?

I know various other diff tools are available like winMerge etc. but I am very much familiar with tortoise svn diff.

score 32 · Answer 1 · edited Jun 15 '15 at 16:07

32

If you want to use Tortoise Merge with TFS. You need to install Tortoise SVN.

And then follow the steps here

Compare Command: C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe
Arguments:
/base:%1 /mine:%2 /basename:%6 /minename:%7

Merge Command: C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe
Arguments: /base:%3 /mine:%2 /theirs:%1 /basename:%8 /minename:%7 /theirsname:%6 /merged:%4 /mergedname:%9

edited Jun 15 '15 at 16:07

SandRock

5,276
3
30
49

answered Apr 19 '11 at 15:25

Dan

29,100
43
148
207

Is there another step to this? I have the same set up however when I try to merge it tells me that Merge Target is not found. See my question here http://stackoverflow.com/q/9313574/37759 – dev.e.loper Feb 16 '12 at 21:43

score 6 · Accepted Answer · answered Oct 18 '10 at 15:02

6

The TSVN diff tools are available separately. See the download page, scroll down to "Tools".

Or directly from here.

answered Oct 18 '10 at 15:02

Stefan

43,293
10
75
117

Using Tortoise SVN diff in TFS

2 Answers2

Linked