From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Dec 2011 06:46:57 +0000 (-0800)
Subject: Merge branch 'jn/gitweb-side-by-side-diff'
X-Git-Tag: v1.7.9-rc0~73
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6fa625a6b757b6aaaf4aaca64a5bd8c038cfb1e8;p=git.git

Merge branch 'jn/gitweb-side-by-side-diff'

* jn/gitweb-side-by-side-diff:
  gitweb: Add navigation to select side-by-side diff
  gitweb: Use href(-replay=>1,...) for formats links in "commitdiff"
  t9500: Add basic sanity tests for side-by-side diff in gitweb
  t9500: Add test for handling incomplete lines in diff by gitweb
  gitweb: Give side-by-side diff extra CSS styling
  gitweb: Add a feature to show side-by-side diff
  gitweb: Extract formatting of diff chunk header
  gitweb: Refactor diff body line classification
---

6fa625a6b757b6aaaf4aaca64a5bd8c038cfb1e8