zsh: more diff improvements