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