Merge branch 'mk/gitweb-diff-hl'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Apr 2012 21:41:01 +0000 (14:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Apr 2012 21:41:01 +0000 (14:41 -0700)
"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()

1  2 
gitweb/gitweb.perl
Simple merge