mergetools / vimdiff3on commit Merge branch 'wg/svn-fe-style-fixes' (ff0b875)
   1. "$MERGE_TOOLS_DIR/vimdiff"