Merge remote-tracking branch 'git-po/maint'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"