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