mergetools / vimdiff2on commit Merge branch 'sb/submodule-update-initial-runs-custom-script' into maint (04b4f7d)
   1. "$MERGE_TOOLS_DIR/vimdiff"