]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitabecddea25e9c39857b963c8a0cffbbdc135caa9
tree2a3be062a6b4edf77cc4e974fec5049e6ce8b535tree | snapshot
parent961abca02c532626df631c851688ec433095d93dcommit | diff
parent3f4f17b51b30262041a2248ef9f966f6248aed50commit | diff
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
diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.