zoukankan      html  css  js  c++  java
  • Using Beyond Compare with TFS

    In order to configure Visual Studio to use Beyond Compare for a compare operation choose the following options:
    1. Select: Tools –> Options –> Expand Source Control –> Choose “Visual Studio Team Foundation Server.
    2. Select: “Configure User Tools.”
    3. Click the “Add” button.
    4. Enter “.*” in the “Extension” edit box.
    5. Choose “Compare” in the “Operation” combo box.
    6. Enter the path to BComp.exe in the “Command” edit box.
    7. Enter the command line parameters from the table below.
    To configure TFS to use Beyond Compare for a merge operation follow the same steps above but choose “Merge” for the operation instead and provide the
    correct merge command line in the table below the compare table.
    *Remember: Beyond Compare 3 Pro supports 3 way merging and the standard edition of it does not. Also 3 way merging is new to Beyond Compare as of version
    3, so this feature is not present in version 2 of the product.
    To summarize the following command line parameters are ones I’ve found to be of the most use:
    Compare
    Product Command Arguments
    TFS (Default) diffmerge.exe %1 %2 %6 %7 %5 /ignorespace
    Beyond Compare 2 BComp.exe %1 %2 /title1=%6 /title2=%7
    Merge
    Product Command Arguments
    TFS (Default) diffmerge.exe /merge %1 %2 %3 %4 %6 %7
    Beyond Compare 2 BComp.exe %1 %2 /title1=%6 /title2=%7
    Beyond Compare 3 (Standard – no 3-way Merge) BComp.exe %1 %2 /savetarget=%4 /title1=%6 /title2=%7
    Beyond Compare 3
    (Pro / 3-way merge)

  • 相关阅读:
    MySQL5.7初始密码查看及重置
    ps top kill
    Linux基础知识[2]【延迟及定时机制】
    大数加减运算
    字符串分隔
    打印NxN的矩阵
    交叉排序
    去除重复字符并排序
    大数求差——(华为实习招聘机试题)
    图解TCP-IP协议
  • 原文地址:https://www.cnblogs.com/gylhaut/p/5504632.html
Copyright © 2011-2022 走看看