Simplify the diff and merge wrapper scripts

detect_labview_version is always callable, so there's no need to test for
it.