mergetools / vimdiff2on commit Merge branch 'vl/typofix' (eac9a1a)
   1. "$MERGE_TOOLS_DIR/vimdiff"