Remove conflict with tkdiff and depend on it instead. with tweaks from sthen@ and me, ok todd@ (previous maintainer)