mergetools / vimdiff3on commit Merge branch 'sb/t9300-typofix' (4d4dc66)
   1. "$MERGE_TOOLS_DIR/vimdiff"