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)
commitb55b936...38ba66233fb765b7b46ed6852dc8fdfb
treedf37509...9bb0a41f16db1dce3621fac3d2e1eceacopy hash to clipboard (tree)
parentd0dffca...f3a721789984aed5a5e0af738b1d9f36copy hash to clipboard (diff)
parentc0bb6d9...ef66d132ba33ff4a62eda3a7038b75d0copy hash to clipboard (diff)
Documentation/diff-options.txt