pletemplate.blogg.se

Winmerge linux
Winmerge linux








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.










Winmerge linux