Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Using Visual Studio comparer tool with VisualHG

I'm using Mercurial with VisualHG extension.

Is there any way to change the KDiff3 code comparer to the Visual Studio Compare and Merge tool?

like image 263
zedkommander Avatar asked Jun 12 '14 11:06

zedkommander


People also ask

Does Visual Studio have a compare two files?

Compare selected filesSelect two files in Solution Explorer and right-click to bring up the context menu. Then select Selected Files to see them side-by-side in the diff view.


2 Answers

I use VisualHg2 with VS 2012.

In Visual Studio.

Tools -> Options -> Source Control -> VisualHg

Dialog should show a text field with a label.

"Custom diff tool (leave blank to use Visual Studio diff)"

I assume the field shows KDiff3 path for you, if so then delete it.

like image 88
Tom Avatar answered Sep 18 '22 23:09

Tom


Tools -> Options -> Source Control -> VisualHg

In the text field:

"$(ProgramFiles (x86))\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe" /diff "$(Base)" "$(Mine)"
like image 35
Victor E. Avatar answered Sep 19 '22 23:09

Victor E.