]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 961abca 3f4f17b)
Merge branch 'jc/diff-ws-error-highlight'
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Jul 2015 19:30:14 +0000 (12:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Jul 2015 19:30:14 +0000 (12:30 -0700)
A hotfix to a new feature in 2.5.0-rc.

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

1  2 
diff.c patch | diff1 | diff2 | blob | history

diff --cc diff.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.