Register /usr/tests/usr.bin/diff3
I wasn't able to make check to run diff3 tests, but kevans figured out that I was missing diff3 in mtree.