mergetools / gvimdiff2on commit mergetools: add support for guiffy (6ceb658)
   1. "$MERGE_TOOLS_DIR/vimdiff"