Toolbar Buttons and Shortcuts

The TestStand File Diff and Merge utility contains the following buttons:

Command Name	Shortcut	Icon	Description
Select Files to Diff	<Ctrl-O>		Launches the Select Files dialog box, in which you select the files you want to compare.
Save Merged File	<Ctrl-S>		Writes the content of the merged file to disk. If a conflict exists in the merged file, the save fails. This option is available only when you compare three files.
Save Modified Files	<Ctrl-S>		Writes the content of the files to disk. This option is available only when you compare two files.
Rediff Files	<Ctrl-Shift-D>		Compares the selected files again. When you compare three files, this option recreates the merged file, discarding any prior changes you made to it.
Switch Files	<Ctrl-I>		Swaps File 1 and File 2. This option is available only when you compare two files.
Generate Report	<Ctrl-R>		Launches the Generate Report dialog box, in which you can specify a file path for an XML that documents the differences found or merges performed in the specified files.
Options	<Ctrl-P>		Launches the File Differ Options dialog box, in which you can configure settings for the utility, including options for loading and automatically merging types, managing type conflict resolution, and so on.
Hide File List	—		Hides the File list .
Hide Filters	—		Hides the Filters tab.
Show File List	—		Shows the File list.
Show Filters	—		Shows the Filters tab.
Collapse All	—		Collapses all items in the Differences table .
Expand All	—		Expands all items in the Differences table.
Find Previous Difference Over	<Ctrl-Shift-B>		Navigates to the previous difference among the files. The utility determines the item with focus and steps over the item to find the previous difference.
Find Previous Difference	<Ctrl-Shift-P> <F7>		Navigates to the previous difference among the files. The utility determines the item with focus and steps into the item to find the previous difference.
Find Next Difference	<Ctrl-Shift-N> <F8>		Navigates to the next difference among the files. The utility determines the item with focus and steps into the item to find the next difference.
Find Next Difference Over	<Ctrl-Shift-O>		Navigates to the next difference among the files. The utility determines the item with focus and steps over the item to find the next difference.
Find Previous Conflict	<Ctrl-Shift-R>		Navigates to the previous conflict among the files. This option is available only when you compare three files and conflicts exist in the merged file.
Find Next Conflict	<Ctrl-Shift-C>		Navigates to the next conflict among the files. This option is available only when you compare three files and conflicts exist in the merged file.

See Also

File Differ Options dialog box

Generate Report dialog box

Select Files dialog box