7th comment - difftool
test #8 mergetool with bcomp
change from master