Merge branch 'jn/glossary-revision'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"