Merge tag 'v2.25.0-rc0' into git-po-master
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"