Merge branch 'ap/maint-update-index-h-is-for-help' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"