diff^... and usr/bin diff