mergetools / vimdiff3on commit Merge branch 'ew/git-svn-http-tests' (612c3df)
   1. "$MERGE_TOOLS_DIR/vimdiff"