Colleagues to send a small Tip, record it.
Merge with winmerge when the code is very convenient, recorded at the configuration method.
- Tools -> Options -> Source Control -> Visual Studio Team Foundation Server -> Configure User Tools.
- 选择 Add Compare and Merge seperately.
- Select the path of your winMerge (other tools should be the same)
- Configuration parameters
- Compare: /x /e /ub /wl /dl %6 /dr %7 %1 %2
- Merge: / x / e / recycling / WL / dl% 6 / dr% 7% 1% 2% 4