Table of Contents
1 - Introduction2 - Integrating with other applications
3 - User interface reference
Contact Information
Sales
Sales and licensing related questions should be sent to our sales team at:Feedback
If you have feedback regarding this website or any of our products, please use the following email address:Support
Questions related to problems you have encountered with either this website or any of our products should be directed to our support team at:Enquiries
Any other questions, or general enquiries should be sent to the following email address:2.3 - Integrating with SmartGit

First you should launch SmartGit, and open the Preferences Dialog. This is done by selecting the Preferences option at the bottom of the Edit menu as shown in the image to the right.

Fill in the information for the new file type as detailed below:
File Pattern
*.vcxproj
This is the file extension for Visual Studio C++ project files.External diff tool/Command
Browse to the Oso XML Merge application folder and select the Oso XML Merge executable. This will be located under either
Program Files or Program Files (x86) depending on which version of Oso XML Merge you
installed, and whether you are using a 32-bit or 64-bit version of Windows.External diff tool/Arguments
-compare -left ${leftFile} -right ${rightFile}
These are the command line options instructing Oso XML Merge to compare the two files specified by SmartGit.
Now we'll set up SmartGit to use Oso XML Merge when merging files. SmartGit always performs three-way merges with a common base file and two changed files that are combined into a single result file.
In the SmartGit preferences dialog, click on the Conflict Solvers item in the tree on the left, and then on the Add button as before to open the Add dialog:

And once again, fill out the information for the new file type as below:
File Pattern
.vcxproj
This is the file extension for Visual Studio C++ project files.External Conflict Solver/Command
Browse to the Oso XML Merge application folder and select the Oso XML Merge executable. This will be located under either
Program Files or Program Files (x86) depending on which version of Oso XML Merge you
installed, and whether you are using a 32-bit or 64-bit version of Windows.External Conflict Solver/Arguments
-merge -base ${baseFile} -left ${leftFile} -right ${rightFile} -result ${mergedFile}
These are the command line options instructing Oso XML Merge to merge the three input files specified by SmartGit into a single output file which
SmartGit will read back once the merge is complete.
SmartGit allows you to specify multiple file extensions for a single third party application, so you can edit the above settings to apply them to as many file types as you require. Simply modify the File Pattern to include a comma-separated list of file extensions. For example, you can use Oso XML Merge to compare and merge Visual Studio property sheets as well as C++ project files by changing the File Pattern to *.vcxproj, *.vsprops.