[mshafer1]

Originally Posted by Philip Arola

...except for with the diff/merge tools Labview comes with.
You can define these as the diff and merge tools when using command line git, and possibly for only .vi files; I have not worked out the latter yet.

My team has used Tortoise Git in the past (which also supports customizing the diff and merge tools to use the LabVIEW provided ones), the tutorial we used to use is no longer online, but this project on Bitbucket is specifically supporting Tortoise Git working with LabVIEW