{"id":853,"date":"2017-09-04T14:49:45","date_gmt":"2017-09-04T13:49:45","guid":{"rendered":"https:\/\/solidt.eu\/site\/?p=853"},"modified":"2017-09-19T14:03:02","modified_gmt":"2017-09-19T13:03:02","slug":"visual-studio-alternate-mergecompare-tool","status":"publish","type":"post","link":"https:\/\/solidt.eu\/site\/visual-studio-alternate-mergecompare-tool\/","title":{"rendered":"Visual studio alternate merge\/compare tool"},"content":{"rendered":"

Source: https:\/\/github.com\/deadlydog\/VS.DiffAllFiles\/wiki\/How-To-Change-The-Default-Visual-Studio-Diff-Tool-For-TFVC<\/a><\/p>\n

Source: https:\/\/github.com\/deadlydog\/VS.DiffAllFiles\/wiki\/Common-Diff-Tool-Configurations-For-TFVC<\/a><\/p>\n

Visual Studio Menu > Tools > Options > Source Control > Visual Studio Team Foundation Server > “Configure User Tools…”<\/p>\n

 <\/p>\n

For compare:<\/strong><\/p>\n

\"\"<\/p>\n

For merge with TortoiseGitMerge<\/strong>, select “Merge” by “Operation:” and as “Arguments”: \u00a0\/base:%1 \/mine:%2 \/basename:%6 \/minename:%7 \/merged:%4<\/p>\n

 <\/p>\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
Product<\/th>\nCommand<\/th>\nArguments<\/th>\n<\/tr>\n<\/thead>\n
TFS default<\/td>\ndiffmerge.exe<\/td>\n%1 %2 %6 %7 %5 \/ignorespace<\/td>\n<\/tr>\n
WinDiff<\/a><\/td>\nwindiff.exe<\/td>\n%1 %2<\/td>\n<\/tr>\n
DiffDoc (for Word files)<\/a><\/td>\nDiffDoc.exe<\/td>\n\/M%1 \/S%2<\/td>\n<\/tr>\n
WinMerge<\/a><\/td>\nwinmerge.exe<\/td>\n\/ub \/dl %6 \/dr %7 %1 %2<\/td>\n<\/tr>\n
Beyond Compare<\/a><\/td>\nbc2.exe<\/td>\n%1 %2 \/title1=%6 \/title2=%7<\/td>\n<\/tr>\n
KDiff3<\/a><\/td>\nkdiff3.exe<\/td>\n%1 –fname %6 %2 –fname %7<\/td>\n<\/tr>\n
Araxis<\/a><\/td>\ncompare.exe<\/td>\n\/wait \/2 \/title1:%6 \/title2:%7 %1 %2<\/td>\n<\/tr>\n
Compare It!<\/a><\/td>\nWincmp3.exe<\/td>\n%1 \/=%6 %2 \/=%7<\/td>\n<\/tr>\n
SourceGear DiffMerge<\/a><\/td>\nDiffMerge.exe<\/td>\n\/title1=%6 \/title2=%7 %1 %2<\/td>\n<\/tr>\n
Beyond Compare 3<\/a><\/td>\nBComp.exe<\/td>\n%1 %2 \/title1=%6 \/title2=%7<\/td>\n<\/tr>\n
TortoiseMerge<\/a><\/td>\nTortoiseMerge.exe<\/td>\n\/base:%1 \/mine:%2 \/basename:%6 \/minename:%7<\/td>\n<\/tr>\n
TortoiseGitMerge<\/a><\/td>\nTortoiseGitMerge.exe<\/td>\n\/base:%1 \/mine:%2 \/basename:%6 \/minename:%7<\/td>\n<\/tr>\n
Visual SlickEdit<\/a><\/td>\nwin\\vsdiff.exe<\/td>\n%1 %2<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n
    \n
  • %1 = Original file (in diff, the pre-changes file, in merge, the “server” or “theirs” file, the file that is the base file after “their” changes were applied)<\/li>\n
  • %2 = Modified file (in diff, the post-changes file, in merge the “yours” file – the base file with “your” changes applied)<\/li>\n
  • %3 = Base file (in the 3-way merge operation, the file which both “theirs” and “yours” are derived from – the common ancestor. This doesn’t mean it’s the version the changes were based from, since this may be a cherry-pick merge)<\/li>\n
  • %4 = Merged file (The output file for the merge operation – the filename that the merge tool should write to)<\/li>\n
  • %5 = Diff options (any additional command-line options you want to pass to your diff tool – this comes into play only when using “tf diff \/options” from the command-line)<\/li>\n
  • %6 = Original file label (The label for the %1 file)<\/li>\n
  • %7 = Modified file label (The label for the %2 file)<\/li>\n
  • %8 = Base file label (The label for the %3 file)<\/li>\n
  • %9 = Merged file label (The label for the %4 file)<\/li>\n<\/ul>\n","protected":false},"excerpt":{"rendered":"

    Source: https:\/\/github.com\/deadlydog\/VS.DiffAllFiles\/wiki\/How-To-Change-The-Default-Visual-Studio-Diff-Tool-For-TFVC Source: https:\/\/github.com\/deadlydog\/VS.DiffAllFiles\/wiki\/Common-Diff-Tool-Configurations-For-TFVC Visual Studio Menu > Tools > Options > Source Control > Visual Studio Team Foundation Server > “Configure User Tools…”   For compare: For merge with TortoiseGitMerge, select “Merge” by “Operation:” and as “Arguments”: \u00a0\/base:%1 \/mine:%2 \/basename:%6 \/minename:%7 \/merged:%4   Product Command Arguments TFS default diffmerge.exe %1 %2 %6 %7 %5 […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"inline_featured_image":false,"footnotes":""},"categories":[6],"tags":[],"class_list":["post-853","post","type-post","status-publish","format-standard","hentry","category-dotnet"],"_links":{"self":[{"href":"https:\/\/solidt.eu\/site\/wp-json\/wp\/v2\/posts\/853","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/solidt.eu\/site\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/solidt.eu\/site\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/solidt.eu\/site\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/solidt.eu\/site\/wp-json\/wp\/v2\/comments?post=853"}],"version-history":[{"count":4,"href":"https:\/\/solidt.eu\/site\/wp-json\/wp\/v2\/posts\/853\/revisions"}],"predecessor-version":[{"id":880,"href":"https:\/\/solidt.eu\/site\/wp-json\/wp\/v2\/posts\/853\/revisions\/880"}],"wp:attachment":[{"href":"https:\/\/solidt.eu\/site\/wp-json\/wp\/v2\/media?parent=853"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/solidt.eu\/site\/wp-json\/wp\/v2\/categories?post=853"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/solidt.eu\/site\/wp-json\/wp\/v2\/tags?post=853"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}