I am using ClearCase as source control for Labview. I created a development branch off of the mainline. When an attempt was made to merge the content back to the mainline there was a complaint that a manual merge would be necessary because the lvproj file had changed after the branch was created. When I look at the version tree I can see that a change was made to the lvproj file after the branch was created. The change was made by a developer no longer with the company. Is there a way to compare the two lvproj files to see what the differences are?
