]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d0dffca c0bb6d9)
Merge branch 'ah/doc-wserrorhighlight' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Aug 2017 21:33:51 +0000 (14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Aug 2017 21:33:51 +0000 (14:33 -0700)
Doc update.

* ah/doc-wserrorhighlight:
  doc: add missing values "none" and "default" for diff.wsErrorHighlight

1  2 
Documentation/diff-options.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/diff-options.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.