mergetools / vimdiff2on commit Merge branch 'ja/diff-opt-typofix' (936dce6)
   1. "$MERGE_TOOLS_DIR/vimdiff"