mergetools / gvimdiff2on commit Merge branch 'tg/maint-zsh-svn-remote-prompt' into maint (f79467e)
   1. "$MERGE_TOOLS_DIR/vimdiff"