LabVIEW with TortoiseGit

Setting up TortoiseGit to use LabVIEW compare

1. Open TortoiseGit settings (right click on any git repo and choose TortoiseGit -> Settings).
2. Choose Diff Viewer from the tree.
3. Click on advanced
4. In Advanced diff settings, click Add....
5. Add Extention .vi with External Program "C:\Program Files (x86)\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" %mine %base -nobdcosm -nobdpos
6. Also add Extention .ctl with the same external program.

Setting up TortoiseGit to use LabVIEW merge

1. Open TortoiseGit settings (right click on any git repo and choose TortoiseGit -> Settings).
2. Choose Diff Viewer->Merge Tool from the tree.
3. Click on advanced
4. In Advanced merge settings, click Add....
5. Add Extention .vi with External Program "C:\Program Files (x86)\National Instruments\Shared\LabVIEW Merge\LVMerge.exe" %base %mine %theirs %merged
6. Also add Extention .ctl with the same external program.

LabVIEW - a system-design platform and development environment for a visual programming language from National Instruments