mergetools / gvimdiffon commit Merge branch 'bc/vcs-svn-cleanup' into maint (044aa0e)
   1. "$MERGE_TOOLS_DIR/vimdiff"