LabVIEW

cancel
Showing results for 
Search instead for 
Did you mean: 

Setting up SVN to call LabVIEW Merge Tool

Hi...Everyone,

I am using SVN as version control for my LabVIEW project. 

I tried configuring the SVN to use LabVIEW's internal merge tool by editing the SVN settings.

I have added ".vi" extension in advance merge settings & have updated "C:\Program Files (x86)\National Instruments\Shared\LabVIEW Merge\LVMerge.exe" %base %mine %theirs %merged" in External command section, but when I try merging 2 VIs the SVN merges the VIs rather than triggering the LV Merge Tool.

Kindly suggest if this is supposed to work in some other way!!

 

PFA the snippet for the configurations.

 
0 Kudos
Message 1 of 1
(1,734 Views)