From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Jun 2015 16:29:51 +0000 (-0700)
Subject: Merge branch 'jc/diff-ws-error-highlight'
X-Git-Tag: v2.5.0-rc0~50
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/709cd912d4663af87903d3d278a3bab9d4d84153

Merge branch 'jc/diff-ws-error-highlight'

Allow whitespace breakages in deleted and context lines to be also
painted in the output.

* jc/diff-ws-error-highlight:
diff.c: --ws-error-highlight=<kind> option
diff.c: add emit_del_line() and emit_context_line()
t4015: separate common setup and per-test expectation
t4015: modernise style
---

709cd912d4663af87903d3d278a3bab9d4d84153