zshrc: Abbreviate VCS type in RPROMPT.
hgrc: Prefer kdiff3 for merges.