Merge branch 'ps/rev-list-object-type-filter'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"