Merge branch 'po/git-help-on-git-itself'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"