%9 = Merged file label (The label for the %4 file) %8 = Base file label (The label for the %3 file) %7 = Modified file label (The label for the %2 file) %6 = Original file label (The label for the %1 file) %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) %4 = Merged file (The output file for the merge operation - the filename that the merge tool should write to) This doesn't mean it's the version the changes were based from, since this may be a cherry-pick merge) %3 = Base file (in the 3-way merge operation, the file which both "theirs" and "yours" are derived from - the common ancestor. %2 = Modified file (in diff, the post-changes file, in merge the "yours" file - the base file with "your" changes applied) For arguments, the anycodings_ms-word variables available for use are the anycodings_ms-word following: %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)
* if anycodings_ms-word you want it to be used for all files not anycodings_ms-word otherwise specified), the operation anycodings_ms-word you're setting up (Compare or Merge), anycodings_ms-word the command to invoke and the arguments anycodings_ms-word to the command. In order to set up a comparison tool, anycodings_ms-word you'll specify the extension (use. anycodings_ms-word This is available via Tools -> anycodings_ms-word Options -> Source Control -> anycodings_ms-word Visual Studio Team Foundation Server anycodings_ms-word -> Configure User Tools" button or anycodings_ms-word via the command-line with tf diff anycodings_ms-word /configure You can configure comparison (diff) and anycodings_ms-word merge tools per file type (extension).
0 kommentar(er)
