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