mergetools / vimdiff2on commit Merge branch 'js/misc-doc-fixes' (caa227f)
   1. "$MERGE_TOOLS_DIR/vimdiff"