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