mergetools / gvimdiff2on commit git svn: migrate tests to use lib-httpd (a8a5d25)
   1. "$MERGE_TOOLS_DIR/vimdiff"