破碎了无痕

  博客园 :: 首页 :: 博问 :: 闪存 :: 新随笔 :: 联系 :: 订阅 订阅 :: 管理 ::

TFS:

1. 打开Option -> Source Control -> Visual Studio TFS -> Configure User Tools;

2. 添加 .*, Compare, C:\Program Files (x86)\SourceGear\DiffMerge\DiffMerge.exe, /title1=%6 /title2=%7 %1 %2;

3. 添加 .*, Merge, C:\Program Files (x86)\SourceGear\DiffMerge\DiffMerge.exe, /title1=%6 /title2=%8 /title3=%7 /result=%4 %1 %3 %2;

 

GIT:

1. 打开Option -> Source Control -> Git Source Control Provider Options -> Configure User Tools;

2. 在External diff tool里指定: C:\Program Files (x86)\SourceGear\DiffMerge\DiffMerge.exe;

posted on 2013-09-06 15:27  破碎了无痕  阅读(193)  评论(0编辑  收藏  举报