mergetools / vimdiff2on commit Merge branch 'ks/submodule-doc-updates' (ab5a940)
   1. "$MERGE_TOOLS_DIR/vimdiff"