![]() Specifies a text version of the first file name without the path file name(version) displays in the compare pane. Specifies that editing the files is not allowed. The three-way compare command from WorkArea has the following format:Ĭompare.exe /wait /max /3 /a3 $(File1) $(File2) $(AncestorFile) /title1:$(Version1) /title2:$(Version2) /title3:$(Version3)īComp.exe /readonly $(File1) $(File2) /title1=$(Version1) /title2=$(Version2) The two-way compare command from WorkArea has the following format:Ĭompare.exe /wait /max /2 $(File1) $(File2) /title1:$(Version1) /title2:$(Version2) The ancestor file displays in the center of the Merge screen.įor example, in the following command /a3 specifies that the third file listed is the ancestor:Ĭompare.exe /wait /3 /a3 $(TrunkFile) $(BranchFile) $(AncestorFile) $(ResultsFile)įor example, in the following command /a1 specifies that the first file listed is the ancestor:Ĭompare.exe /wait /3 /a1 $(AncestorFile) $(TrunkFile) $(BranchFile) $(ResultsFile) Specifies which file in a sequence of files on the command line is the common ancestor file. The three-way merge command has the following format:Ĭompare.exe /wait /max /3 /a3 $(TrunkFile) $(BranchFile) $(AncestorFile) $(ResultsFile) The two-way merge command has the following format:Ĭompare.exe /wait /max /2 $(TrunkFile) $(BranchFile) $(ResultsFile) The compare command has the following format:Ĭompare.exe /wait /max /2 $(File1) $(File2) Use the following compare or merge commands for the Araxis tool. Araxis Merge Professional Default Command Lines.Note: For help with additional parameters you can set for a tool, see the help for that tool. $(FilePath1), $(FilePath2), $(TrunkFilePath), $(BranchFilePath), $(AncestorFilePath), $(ResultsFilePath)ĭefault commands for external tools are defined in the following list the tools differ with regard to which parameters need to be replaced in command syntax: For this case, the following corresponding parameters are defined: Some external tools require full path names and file names to be specified on the command line. $(Version1), $(Version2)ĭefines the path to the files displayed in the left and right panes of the compare tool. $(AncestorFile)ĭefines common ancestor file for three-way merge only. ![]() ![]() $(TrunkFile), $(BranchFile), $(ResultsFile)ĭefines files displayed in the left and right panes of the merge tool and the results file for two-way and three-way merge. The following parameters define only file names and not complete file paths: $(File1), $(File2)ĭefines files displayed in the left and right panes of the comparison tool. All external tools require file names to be specified on the command line. Comparing and Merging Versions › External Compare or Merge Tools › Default Command Line Settingsĭefault command lines for supported external tools are provided in the list of external tools that follows. ![]()
0 Comments
Leave a Reply. |