xdiff-merge: optionally show conflicts in "diff3 -m" style
[gitweb.git] / t / lib-httpd /
2008-03-02 Merge branch 'pb/cvsimport'
2008-03-02 Merge branch 'jc/maint-log-merge-left-right'
2008-03-02 Merge branch 'mh/maint-http-proxy-fix'
2008-03-02 Merge branch 'cb/http-test'
2008-02-27 http-push: add regression tests