mergetools / vimdiff3on commit Merge branch 'jk/initialization-fix-to-add-submodule-odb' (acfeaf8)
   1. "$MERGE_TOOLS_DIR/vimdiff"