mergetools / gvimdiff3on commit Merge branch 'km/init-doc-typofix' (a3d4173)
   1. "$MERGE_TOOLS_DIR/vimdiff"