mergetools / gvimdiff2on commit git-svn: document svn.authorsProg in config (cec9264)
   1. "$MERGE_TOOLS_DIR/vimdiff"