mergetools / gvimdiffon commit Merge branch 'jk/initialization-fix-to-add-submodule-odb' into maint (f97aee1)
   1. "$MERGE_TOOLS_DIR/vimdiff"