Diff Tool in VS

Oct 30, 2010 at 9:07 AM

How does one go about specifying the diff tool to use in VisualStudio for VisualHG diffs?

HG Diff uses KDiff3 by default. How does one change this to say BeyondCompare?

This is easily done if using TFS as source control like this http://blogs.msdn.com/b/jmanning/archive/2006/02/20/diff-merge-configuration-in-team-foundation-common-command-and-argument-values.aspx

Coordinator
Oct 30, 2010 at 10:18 AM

This is hard coded for now. In one of the next versions it will become more flexible.

Thanks for your link, I will see if I can cover the one or the other.

Bernd

Oct 30, 2010 at 11:24 AM

Great!

Thanks for your very rapid responsis Bernd.

Nov 22, 2010 at 7:34 AM

TortoiseHG has this feature already. It would be great if VisualHG could as well.

http://i.imgur.com/LQH39.png

Nov 23, 2010 at 11:23 PM

I was able to update the source to use WinMerge without must understanding.

Copied the WinMerge folder to C:\Program Files (x86)\TortoiseHg and updated the one line with kdiff3.exe in it:

InvokeCommand( "kdiff3.exe" , root, cmd);    =>  InvokeCommand( "WinMerge\\WinMergeU.exe" , root, cmd); 

I don't know if it mattered but I already had TortoiseHg using winmerge with my user config file:

%userprofile%\.hgrc

[ui]merge = winmergeu
 
 
[extdiff]
cmd.winmerge = C:\Program Files (x86)\WinMerge\WinMergeU.exe
opts.winmerge = /e /x /ub /wl
 
[merge-tools]
winmergeu.executable = C:\Program Files (x86)\WinMerge\WinMergeU.exe
winmergeu.priority= 1
winmergeu.fixeol=True
winmergeu.checkchanged=True
winmergeu.args= /e /ub /dl other /dr local $other $local $output
winmergeu.gui=False
 
[tortoisehg]
vdiff = winmerge

Apr 9, 2011 at 2:22 PM

Is this now available?