|
||
| Products Download Events Support Videos | ||
Technical Support
On-Line Manuals
µVision User's Guide
About µVision
User Interface
Creating Applications
Utilities
Debugging
Debug Commands
Debug Functions
Simulation
Flash Programming
Dialogs
File
Device Database
License Management
Edit
Configuration
Editor
Colors & Fonts
User Keywords
Shortcut Keys
Text Completion
Other
View
Symbols Window
Setup Logic Analyzer
Performance Analyzer
Project
Project Items
Project Items
Folders/Extensions
Books
Select Device
Batch Build
Options
Device
Properties
Target
Target (Keil C166)
Target (Keil C51)
Target (Keil C251)
Output (Keil)
Listing (Keil)
User
Compiler
Keil C166 Compiler
Keil EC++ Compiler
Keil Cx51 Compiler
Keil C251 Compiler
Assembler
Keil A166 Assembler
Keil Ax51 Assembler
Keil A251 Assembler
Linker
Keil L166 Locate
Keil L166 Misc
Keil Lx51 Locate
Keil Lx51 Misc
Keil BL51 Locate
Keil BL51 Misc
Debug
Utilities
Debug
Breakpoints
Memory Map
Function Editor
Inline Assembler
Tools
Setup PC-Lint
Customize Tools Menu
Configure Merge Tool
SVCS
Example Programs
Command Line
Appendix
Configure Merge Tool
Setup and configure a merge tool to update files. Merge tools make it easy to transfer configuration settings from a back-up file to the new configuration file.
Open the dialog with the menu Tools - Configure Merge Tool.
Where
| Command | Specify the executable of the merge tool. Use the browse button to select the executable or enter the path manually. Environment variables can be used as explained in Key Sequences. External applications should not add paths to the MRU list in the Select Field or Folders dialog. |
| Arguments | Specify the arguments for the merge tool. You can use Key Sequences to pass arguments. Refer to the documentation of your merge tool for additional arguments and command line parameters. |
The picture shows the setup for WinMerge. The argument:
- $previous identifies the back-up file (extension *.NNNN).
- $current identifies the new configuration file delivered with the Software Component.
The table provides a list of merge tools.
| Merge Tool | Version |
|---|---|
| TortoiseMerge | any Version |
| WinMerge | any Version |
| List of merge tools | N/A |
ProductsDevelopment Tools |
Hardware & Collateral |
Downloads |
Support |
Contact |
 |
||||