mergetools / vimdiff2on commit Merge branch 'master' of git://bogomips.org/git-svn (41dd433)
   1. "$MERGE_TOOLS_DIR/vimdiff"