[Woolly]

Originally Posted by Greg McKaskle

I use compare more often than merge. I generally don't need to merge and instead just review that my changes make sense.

I attached an image of what diff looks like. The window on the bottom shows the description of the diff and the upper two windows are the two files with the objects selected and some items circled.

Greg McKaskle

Originally Posted by Joe Ross

Here's how to set up graphical diffing and merging for TortoiseSVN. It would be similar for other tools.

https://decibel.ni.com/content/docs/DOC-2936

Alright, there's actually a toolbar inside of labview for all that stuff, definately will be helpful for summer projects and next year. Thanks!

Originally Posted by bumblebee3339

Is there a way to download it without the SVN?

Here's a rar file of it! http://2013swat-robot-code.googlecod...lds%202013.rar