Because I use TFs for version management, I don't need the internal spring tool, it takes some time to find out how to set the parameters. The following describes how to set the parameters.
Enable Logging
- Start Visual Studio
- Choose tools> options, and open the selection Options dialog box.
- In the Options settings window, source control> Visual Studio team Foundation Server
- Select Custom configure user tools
When 1 options when window
New parameter settings
Extension:*
Operation:Compare
Command:C: \ Program Files \ winmerge \ winmergeu.exe (or another address)
Arguments:/X/e/S/UB/WL/dl% 6/DR% 7 % 1% 2(Set with the delimiter% 1% 2Yes, but there are other settings. For example, if the ratio is the same, you can automatically perform the relevant operations after you press the correct settings)
Limit 2 Ratio
Add merging settings
Extension:*
Operation:Merge
Command:C: \ Program Files \ winmerge \ winmergeu.exe (or another address)
Arguments:/X/e/S/UB/dl% 6/DR% 7% 1% 2% 4
Merge 3 settings
Note:
The merging function is not very well integrated, and the automatic merging is missing, and then the internal merging tool is used again.
Exam preparation document
Winmerge help
- Command Line
- Comparing and merging files