mergetools / vimdiff2on commit Merge git://git.bogomips.org/git-svn (1cc625f)
   1. "$MERGE_TOOLS_DIR/vimdiff"