Fixed splitdiffD test-case (trac #33).

Use LSDIFF environment variable in splitdiff to find lsdiff binary.
Export LSDIFF environment variable when running tests.
Merge remote-tracking branch 'upstream/master'