Merge branch 'cm/gitweb-project-list-persistent-cgi-fix'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"