diff/merge settings updated so git should use labview's tools to resolve conflicts on .vi files. other files not supported yet.