LabVIEW or TestStand File Diff using TortoiseSVN or TortoiseGit
When you're extensively working in LabVIEW or TestStand with multiple developers, you could easily end up in the need of merging different VIs or sequences. The LVCompare tool and TestStand File Diff and Merge Utility come in handy. Here is how you set up the Tortoise settings to make the diff handier right from the context menu using TortoiseSVN or TortoiseGit. You can diff the files this way without the need to go through the file selection dialog boxes. https://www.youtube.com/watch?v=UsvqPt8MB0g&feature=youtu.be For .vi file of LabVIEW "C:\Program Files\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" %base %mine For .seq file of Teststand "C:\Program Files\National Instruments\Shared\TestStand\FileDifferLauncher.exe" %base %mine References For LabVIEW diff with merge, there is a good article here from Delacor.