You can configure a third-party source control provider to use LVMerge.exe as the default merge application. LVMerge.exe is equivalent to the Merge VIs dialog box. Use LVMerge.exe to automatically or interactively resolve differences between an original VI and two revisions of the original VI.
|Note LVMerge.exe is available only with the LabVIEW Professional Development System.|
Complete the following steps to configure a third-party source control provider to use LVMerge.exe as the default merge application.
|1 (optional)||Specifies path to the version of LabVIEW to use for the merge operation. If you do not supply this argument, the Merge VIs dialog box uses the following versions of LabVIEW by default:
|2||Absolute path to a copy of the VI from where you checked it out (Base VI).|
|3||Absolute path to a copy of the latest revision of the VI in source control (Their VI).|
|4||Absolute path to the VI you edited (Your VI).|
|5||Absolute path to which to save the merged VI.|
For example, to specify the version of LabVIEW for the merge operation is LabVIEW 8.6, use the following command line:
LVMerge.exe "C:\Program Files\National Instruments\LabVIEW 8.6\LabVIEW.exe" c:\files\base.vi c:\files\theirs.vi c:\files\yours.vi c:\files\merged.vi.
In the command line, the first path is optional and leads to the location of the LabVIEW executable.