Merge branch 'ab/gitweb-link-html-escape' into maint
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"