diffDir -> diff3 not convincing