mergetools / vimdiff2on commit Merge branch 'jn/glossary-revision' (019eb0d)
   1. "$MERGE_TOOLS_DIR/vimdiff"