mergetools / vimdiff2on commit Merge branch 'ew/svn-maint-fixes' (a6f9dec)
   1. "$MERGE_TOOLS_DIR/vimdiff"