For some reason, I don't have a LVCompare.
Had to change the binary line to this for it to execute:
Code:
git config --system merge.labview.recursive binary
And I could not get the merge.labview.driver line to run. Git didn't like it for some reason.
If I have this in my .gitconfig for the diff,
Code:
[diff "labview"]
command = "C:/Program Files/meta-diff suite/lvdiff.exe"
#command = 'C:/Users/Tanner/Desktop/FIRST 2010 Beta/lvcompare.sh'
"git diff" either does nothing or prints out a paragraph length of empty space to the terminal.
Still get the same thing for merging. The little error dialog does spend some time being open, but I can't find anything else open. When I did it, it didn't seem to merge anything, just use the last commit out of the two branches I merged.
-Tanner