[DominickC]

This year our team's programming mentor suggested setting up some sort of version control system, so we went with SVN.

TortoiseSVN is our preferred client. It preforms all of the functions you said it doesn't (merge, visual diff, push, commit, update). The people who head the Tortoise project also have an SVN monitor tool to alert you to new commits by polling the SVN server every x number of minutes.

Tortoise's integration with LabVIEW was nearly plug-and-play. The only thing that required a little bit of effort was selecting the visual differencing VI from the correct directory.

Dom