ksdiff tool for svn diff
Don't exit the main shell on the watch and usage commands.
Updated oh-my-zsh
Fix merge conflict on .subversion/config