mergetools / vimdiff2on commit Merge branch 'bc/vcs-svn-cleanup' (4c3be63)
   1. "$MERGE_TOOLS_DIR/vimdiff"