patience diff and better log output