mergetools / gvimdiff2on commit Merge branch 'ta/glossary' (ad77690)
   1. "$MERGE_TOOLS_DIR/vimdiff"