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