Thank you for writing back.
The vsdiffmerge.exe merge tool in Visual Studio 2017 is usually located here: C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer.
You will also need to create one additional folder named Ide
inside the Team Explorer
folder Then you can copy the vsdiffmerge.exe
file from the Team Explorer
folder to the newly created Ide
folder. You can check the attached vsdiffmerge-path.png
Then you can create the environment variable like this:
- Variable name: VS120COMNTOOLS
- Path: C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\IDE
Please also check the other two screenshots showing the Edit System Variable
window and the end result on my end in Visual Studio 2017.
Regarding the changed encoding, I logged an issue on the feedback portal, here:
FIX. WinForms Converter - the converter should not change the encoding of the modified files
. Your Telerik points
are also updated. Additionally, you can subscribe to the item and be updated with its status changes.
I hope this information is useful. Please let me know if you have other questions.