From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Jul 2015 19:30:14 +0000 (-0700)
Subject: Merge branch 'jc/diff-ws-error-highlight'
X-Git-Tag: v2.5.0-rc3~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abecddea25e9c39857b963c8a0cffbbdc135caa9;p=thirdparty%2Fgit.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