mergetools / vimdiff3on commit Merge branch 'rn/glossary-typofix' (5a29068)
   1. "$MERGE_TOOLS_DIR/vimdiff"