mergetools / gvimdiff2on commit Merge branch 'ls/travis-enable-httpd-tests' into maint (dbc5276)
   1. "$MERGE_TOOLS_DIR/vimdiff"