From: Junio C Hamano <redacted>
Date: Wed, 15 Jul 2015 19:30:14 +0000 (-0700)
Subject: Merge branch 'jc/diff-ws-error-highlight'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=abecddea25e9c39857b963c8a0cffbbdc135caa9;p=git.git

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

A hotfix to a new feature in 2.5.0-rc.

* jc/diff-ws-error-highlight:
  diff: parse ws-error-highlight option more strictly
---

abecddea25e9c39857b963c8a0cffbbdc135caa9