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

Junio C Hamano committed Jul 15, 2015 at 12:30 UTC abecddea25e9c39857b963c8a0cffbbdc135caa9

No changes.