From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Apr 2012 21:41:01 +0000 (-0700)
Subject: Merge branch 'mk/gitweb-diff-hl'
X-Git-Tag: v1.7.11-rc0~107
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c6cfa5bbbba9eb4fb8d45d2ab942b1ebcb2bcb73?hp=--cc

Merge branch 'mk/gitweb-diff-hl'

"gitweb" learns to highlight the patch it outputs even more.

By Michał Kiedrowicz (7) and Jakub Narębski (1)
* mk/gitweb-diff-hl:
gitweb: Refinement highlightning in combined diffs
gitweb: Highlight interesting parts of diff
gitweb: Push formatting diff lines to print_diff_chunk()
gitweb: Use print_diff_chunk() for both side-by-side and inline diffs
gitweb: Extract print_sidebyside_diff_lines()
gitweb: Pass esc_html_hl_regions() options to esc_html()
gitweb: esc_html_hl_regions(): Don't create empty <span> elements
gitweb: Use descriptive names in esc_html_hl_regions()
---

c6cfa5bbbba9eb4fb8d45d2ab942b1ebcb2bcb73