mergetools / vimdiff3on commit Merge branch 'rn/glossary-typofix' into HEAD (8d61f0f)
   1. "$MERGE_TOOLS_DIR/vimdiff"