In the “ui” section, set the value of “merge” to “vsDiffMerge”.
#Tortoisehg change diff tool how to#
They know where to find it, and how to invoke it for a merge or diff. Now Mercurial and TortoiseHg know that there is a merge tool called vsDiffMerge. VsDiffMerge.diffargs=/Diff $parent $child VsDiffMerge.args=/Merge $local $other $base $output VsDiffMerge.executable=%UserProfile%\HgVsDiffMerge.bat Copy the batch script code below into the new file and then save the new file as HgVsDiffMerge.bat in your user directory (%USERPROFILE%). Open the text editor and create a new file. The batch file will handle calling the Visual Studio components and give us a simple path to configure in Mercurial.ini. We will do most of the work in Mercurial.ini, and a new batch file that we will create. If we have everything we need, and have verified the few things mentioned above, we are ready to proceed. If you cannot shut down TortoiseHg, that is fine but will require a restart at the end. You should have a file named Mercurial.ini in your user directory, typically “C:\Users\%USERNAME%” or “%USERPROFILE%”.You should have a file named vsDiffMerge.exe in the Visual Studio IDE directory, typically “C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\vsDiffMerge.exe”.Visual Studio (I used Visual Studio 2013 Ultimate).I will not cover the steps for setting up, nor using VisualHg as its own site does a good job of that already. I have detailed the process of setting this up below, and authored an installer, which automates these steps. To that end, I have been using VisualHg as my source code control provider in Visual Studio, and recently found a way to use Visual Studio as my Diff and Merge tool from TortoiseHg. For me this seemed to be a disconnected experience and I have been looking for ways to deeply integrate it. With my current employer, we use Mercurial, and we use TortoiseHg to interface with it. Typically, when I have worked within Visual Studio on source-controlled projects I have used Team Foundation Server (TFS).
0 kommentar(er)
