External Programs Options (Tools Menu > Options)

Tab Items

Application for diff/merge

This option is used to specify an external application for visual diff/merge on files or directories. The Dynamsoft SourceAnywhere for VSS Diff/Merge tool MergeHero is configured by default. 

Note: If MergeHero is configured, the following arguments items will be invalid.

Arguments for diff files

This option allows you to specify the arguments to supply to the diff tool for files diff when the diff tool is invoked. The following macros are available (the macros are case-sensitive):

• %DIFFMERGE_TOOL% - expands to the path of the application used for diff/merge.
• %FIRST_FILE% - expands to the path of the file that will be supplied for the left side of the diff output.
  
• %SECOND_FILE% - expands to the path of the file that will be supplied for the right side of the diff output.
  

For example, to invoke windiff to compare two files from command line, the command is as follows:

Windiff path_to_first_file path_to_second_file

So, the entry for this field that is appropriate for the external diff tool Windiff is:

"%DIFFMERGE_TOOL%" "%FIRST_FILE%" "%SECOND_FILE%"

Arguments for diff directories

This option allows you to specify the arguments to supply to the diff tool for directories diff when the diff tool is invoked. The following macros are available (the macros are case-sensitive):

• %DIFFMERGE_TOOL% - expands to the path of the application used for diff/merge.
• %FIRST_DIR% - expands to the path of the directory that will be supplied for the left side of the diff output.
  
• %SECOND_DIR% - expands to the path of the directory that will be supplied for the right side of the diff output.
  

Arguments for three-way merge:

This option allows you to specify the arguments to supply to the merge tool for three-way merge when the merge tool is invoked. The following macros are available (the macros are case-sensitive):

• %DIFFMERGE_TOOL% - expands to the path of the application used for diff/merge.
• %BASE_FILE% - expands to the path of the file that is the common ancestor, or baseline between the two files being merged.
  
• %THEIRS_FILE% - expands to the path of the first file that is being merged.
  
• %YOURS_FILE% - expands to the path of the second file that is being merged.